Skip to content

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

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

parents 7c10ec2b 05dc1d22
Hide whitespace changes
Inline Side-by-side
Showing with 187 additions and 59 deletions
attendance-performance-manager-ui/admin/src/components/SearchForm.vue
View file @ d826206d
......@@ -129,7 +129,7 @@
v-if="item.type === 'month' && !item.valueFormat"
type="month"
value-format="yyyy-MM"
placeholder="选择月份"
:placeholder="item.label ? item.label : '选择月份'"
>
</el-date-picker>
......@@ -138,7 +138,7 @@
v-if="item.type === 'month' && item.valueFormat"
type="month"
:value-format="item.valueFormat"
placeholder="选择月份"
:placeholder="item.label ? item.label : '选择月份'"
>
</el-date-picker>
......@@ -155,7 +155,6 @@
<el-form-item>
<el-button
type="primary"
class="addclass"
icon="el-icon-search"
@click="onSubmit"
title="查询"
......@@ -195,17 +194,16 @@ export default {
},
watch: {
$route(route) {
console.log(222);
this.initForm(route.query);
},
},
async created() {
console.log("1111");
this.initForm(this.$route.query);
},
methods: {
remoteMethod(query, searchType) {
if (query == "") {
console.log("查询参数为空！");
return;
}
this.loading = true;
......@@ -256,12 +254,11 @@ export default {
}
});
this.form = Object.assign({}, this.form, newFormData);
// this.form = Object.assign({}, this.form, data);
// console.log("after form",this.form)
this.form = Object.assign({}, this.form, data);
// console.log(this.form,'dddddd')
},
cleanForm() {
this.clean();
this.onSubmit();
},
// 清空表单值
clean() {
......@@ -270,30 +267,55 @@ export default {
if (item.name === "groupList") {
newData[item.name] = [];
} else {
newData[item.name] = item.multiple ? [] : undefined;
newData[item.name] = item.multiple ? [] : "";
}
});
this.form = Object.assign({}, this.form, newData);
this.onSubmit();
},
onSubmit() {
let { path, query } = this.$route;
let data = this.decode(this.form);
console.log("data:", data);
console.log("form", this.form);
//delete this.form["deviceStatusList"]
if (this.form.attendanceDateStart && this.form.attendanceDateEnd) {
let startValue = Date.parse(this.form.attendanceDateStart);
let endValue = Date.parse(this.form.attendanceDateEnd);
if (startValue > endValue) {
this.$message.error("查询-结束的日期需大于开始日期");
this.form.attendanceDateEnd = "";
return false;
}
}
if (this.form.startTime && this.form.endTime) {
let startValue = Date.parse(this.form.startTime);
let endValue = Date.parse(this.form.endTime);
if (startValue > endValue) {
this.$message.error("查询-结束的日期需大于开始日期");
this.form.endTime = "";
return false;
}
}
let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据
// console.log(this.form,'form参数')
let data = this.decode(params);
// Object.assign({}, query, data)
this.$router.push({
path: path,
query: Object.assign({}, query, data),
query: {
...query,
...data,
},
});
//this.decodetwo(this.form)
},
// 解析url字符串，去除query字段
encode(data, formTemp) {
let newData = {};
Object.keys(Qs.parse(data)).forEach((item) => {
console.log(item);
if (/^query\./.test(item)) {
let val = data[item];
let key = item.replace(/^query\./, "");
this.search.forEach((obj) => {
if (
obj.name === key &&
......@@ -343,33 +365,6 @@ export default {
});
return newData;
},
decodetwo(data) {
let newData = { page: 1 };
Object.keys(data).forEach((item) => {
let val = data[item];
this.search.forEach((obj) => {
if (
obj.name === item &&
obj.fuzzy === true &&
val &&
val.length > 0
) {
//支持模糊查询,收尾增加百分号
val = val.trim();
if (val.charAt(0) == "%") {
val = val.slice(1);
}
if (val.charAt(val.length - 1) == "%") {
val = val + "%";
}
}
});
newData[item] = this.decodeVal(val);
});
return newData;
},
decodeVal(val) {
let valType = type(val);
if (["Number", "Boolean"].indexOf(valType) > -1) {
......@@ -391,7 +386,7 @@ export default {
data() {
return {
form: {
groupList: [],
// groupList: [],
},
remoteOptions: {},
};
......
attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue
View file @ d826206d
......@@ -44,7 +44,7 @@ export default {
},
doExport() {
this.isExport = true;
this.$download("/leave/record/exportExcel", {
this.$download("/attendance/leave/record/exportExcel", {
"idList": this.selection,
'name': this.$route.query['name'],
}, {type: "excel"}).then(() => this.isExport = false).catch(error => {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/req/ComplainSaveReq.java
View file @ d826206d
......@@ -43,5 +43,4 @@ public class ComplainSaveReq extends BaseReq {
private String complainDevice;
}
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/req/GoWorkSaveReq.java
View file @ d826206d
......@@ -33,4 +33,5 @@ public class GoWorkSaveReq extends BaseReq {
*/
private String ext;
}
attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/ApiWebPerformController.java
View file @ d826206d
package com.mortals.xhx.busiz.h5.web;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
......@@ -55,7 +56,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
@PostMapping("attend/save")
@UnAuth
public Rest<Void> attendSave(@RequestBody AttendSaveReq req) {
log.info("web Api req==>{}", JSON.toJSONString(req));
String busiDesc = "外部考勤新增";
Rest rest = Rest.ok(busiDesc + "成功！");
try {
......@@ -80,7 +81,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
@PostMapping("review/save")
@UnAuth
public Rest<Void> reviewSave(@RequestBody ReviewSaveReq req) {
log.info("web Api req==>{}", JSON.toJSONString(req));
String busiDesc = "外部评价新增";
Rest rest = Rest.ok(busiDesc + "成功！");
try {
......@@ -105,7 +106,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
@PostMapping("complain/save")
@UnAuth
public Rest<Void> complainSave(@RequestBody ComplainSaveReq req) {
log.info("web Api req==>{}", JSON.toJSONString(req));
String busiDesc = "外部投诉新增";
Rest rest = Rest.ok(busiDesc + "成功！");
try {
......@@ -130,7 +131,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
@PostMapping("gowork/save")
@UnAuth
public Rest<Void> goworkSave(@RequestBody GoWorkSaveReq req) {
log.info("web Api req==>{}", JSON.toJSONString(req));
String busiDesc = "外部办件新增";
Rest rest = Rest.ok(busiDesc + "成功！");
try {
......@@ -156,6 +157,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
@UnAuth
public Rest<Void> effectSave(@RequestBody EffectSaveReq req) {
log.info("web Api req==>{}", JSON.toJSONString(req));
String busiDesc = "外部效能新增";
Rest rest = Rest.ok(busiDesc + "成功！");
try {
......@@ -180,7 +182,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
@PostMapping("other/save")
@UnAuth
public Rest<Void> otherSave(@RequestBody OtherSaveReq req) {
log.info("web Api req==>{}", JSON.toJSONString(req));
String busiDesc = "外部其它绩效新增";
Rest rest = Rest.ok(busiDesc + "成功！");
try {
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceLeaveRecordEntity.java
View file @ d826206d
......@@ -11,7 +11,7 @@ import lombok.Data;
* 请假记录信息实体对象
*
* @author zxfei
* @date 2023-07-18
* @date 2023-07-19
*/
@Data
public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
......@@ -20,11 +20,11 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
/**
* 请假人id
*/
@Excel(name = "请假人id")
private Long leavePersonId;
/**
* 请假人
*/
@Excel(name = "请假人")
private String leavePerson;
/**
* 所属部门id
......@@ -37,26 +37,32 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
/**
* 电话号码
*/
@Excel(name = "电话号码")
private String phoneNumber;
/**
* 请假类型(1.事假,2.调休,3.病假,4.年假,5.产假,6.陪产假,7.婚假,8.例假,9.哺乳假,10.丧假,11.回单位,12.因公请假,13.外出勘验,14.值班补班,15.体检,16.隔离,17.因公外出,18.公休,19.育儿假,20.调回单位,21.探亲假)
*/
@Excel(name = "请假类型", readConverterExp = "1=事假,2=调休,3=病假,4=年假,5=产假,6=陪产假,7=婚假,8=例假,9=哺乳假,10=丧假,11=回单位,12=因公请假,13=外出勘验,14=值班补班,15=体检,16=隔离,17=因公外出,18=公休,19=育儿假,20=调回单位,21=探亲假")
private Integer leaveType;
/**
* 开始时间
*/
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime;
/**
* 结束时间
*/
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime;
/**
* 时长,单位秒
*/
@Excel(name = "时长,单位秒")
private Integer duration;
/**
* 请假事由
*/
@Excel(name = "请假事由")
private String reason;
/**
* 审批负责人Id
......@@ -85,14 +91,17 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
/**
* 审核结果(1.申请通过,2.申请不通过)
*/
@Excel(name = "审核结果", readConverterExp = "1=申请通过,2=申请不通过")
private Integer auditResult;
/**
* 审核说明
*/
@Excel(name = "审核说明")
private String auditDesc;
/**
* 审核时间
*/
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
/**
* 处理状态
......@@ -116,7 +125,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
public void initAttrValue(){
this.leavePersonId = null;
this.leavePersonId = -1L;
this.leavePerson = "";
......@@ -126,7 +135,7 @@ public class AttendanceLeaveRecordEntity extends AttendanceLeaveRecordVo {
this.phoneNumber = "";
this.leaveType = null;
this.leaveType =null;
this.startTime = null;
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java
View file @ d826206d
......@@ -135,7 +135,7 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
checkDingMsg.setScore(entity.getScore().toString());
checkDingMsg.setSubAddType(entity.getSubAddType());
checkDingMsg.setPath(String.format("#/api/v1/perform/info?id=%s&&performType=complain", entity.getId()));
Rest<String> msgRest = messageService.sendDingTalkWorkMsg(checkDingMsg);
messageService.sendDingTalkWorkMsg(checkDingMsg);
} else {
log.error("根据手机号码获取人员错误，msg:{}", personRest.getMsg());
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java
View file @ d826206d
......@@ -4,6 +4,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
......@@ -47,6 +49,8 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
public CheckAttendRecordController() {
super.setModuleDesc("考勤绩效记录核查信息");
......@@ -62,6 +66,10 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "createUserId", collect);
super.init(model, context);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java
View file @ d826206d
......@@ -3,6 +3,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
......@@ -39,6 +41,8 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
public CheckComplainRecordController(){
super.setModuleDesc( "评价绩效投诉核查信息");
......@@ -54,6 +58,12 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
this.addDict(model, "complainSource", ReviewSourceEnum.getEnumMap());
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "createUserId", collect);
}
@Override
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java
View file @ d826206d
......@@ -3,6 +3,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
......@@ -40,6 +42,9 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
public CheckEffectRecordController(){
super.setModuleDesc( "效能绩效核查信息");
}
......@@ -54,6 +59,12 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "createUserId", collect);
}
@Override
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java
View file @ d826206d
......@@ -3,6 +3,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
......@@ -40,6 +42,9 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
public CheckGoworkRecordController(){
super.setModuleDesc( "办件绩效核查信息");
}
......@@ -54,6 +59,12 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "createUserId", collect);
}
@Override
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java
View file @ d826206d
......@@ -3,6 +3,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
......@@ -40,6 +42,9 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
public CheckOtherRecordController(){
super.setModuleDesc( "其它绩效核查信息");
}
......@@ -54,6 +59,12 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "createUserId", collect);
}
@Override
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java
View file @ d826206d
......@@ -4,6 +4,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
......@@ -48,6 +50,9 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
public CheckReviewRecordController() {
super.setModuleDesc("评价差评绩效核查信息");
}
......@@ -67,6 +72,12 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
this.addDict(model, "reviewSource", ReviewSourceEnum.getEnumMap());
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "createUserId", collect);
}
@Override
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/impl/DingPersonServiceImpl.java
View file @ d826206d
......@@ -18,6 +18,7 @@ import com.taobao.api.ApiException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.logging.Log;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@Service("dingPersonService")
......@@ -75,11 +76,16 @@ public class DingPersonServiceImpl extends AbstractDingTalkService implements ID
req.setUseridList(workMsgReq.getUseridList());
//.setMsg(JSON.toJSONString(workMsgReq.getMsg()));
log.info("workMsgReq:{}",JSON.toJSONString(workMsgReq));
OapiMessageCorpconversationAsyncsendV2Request.Msg msg = new OapiMessageCorpconversationAsyncsendV2Request.Msg();
OapiMessageCorpconversationAsyncsendV2Request.Link link = new OapiMessageCorpconversationAsyncsendV2Request.Link();
link.setMessageUrl(workMsgReq.getMsg().getLink().getMessageUrl());
link.setText(workMsgReq.getMsg().getLink().getText());
link.setTitle(workMsgReq.getMsg().getLink().getTitle());
if(!ObjectUtils.isEmpty(workMsgReq.getMsg())&&!ObjectUtils.isEmpty(workMsgReq.getMsg().getLink())){
link.setMessageUrl(workMsgReq.getMsg().getLink().getMessageUrl());
link.setText(workMsgReq.getMsg().getLink().getText());
link.setTitle(workMsgReq.getMsg().getLink().getTitle());
}
link.setPicUrl("@lADOADmaWMzazQKA");
msg.setLink(link);
msg.setMsgtype("link");
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackAnswerController.java
View file @ d826206d
package com.mortals.xhx.module.feedback.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.jws.soap.SOAPBinding;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
......@@ -36,6 +40,7 @@ public class FeedbackAnswerController extends BaseCRUDJsonBodyMappingController<
@Autowired
private ParamService paramService;
public FeedbackAnswerController(){
super.setModuleDesc( "绩效问题回答");
}
......@@ -43,6 +48,7 @@ public class FeedbackAnswerController extends BaseCRUDJsonBodyMappingController<
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "questionType", paramService.getParamBySecondOrganize("FeedbackAnswer","questionType"));
super.init(model, context);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java
View file @ d826206d
......@@ -3,6 +3,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
......@@ -39,6 +41,8 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
public PerformAttendRecordController(){
super.setModuleDesc( "考勤绩效记录信息");
......@@ -52,6 +56,10 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "createUserId", collect);
super.init(model, context);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformComplainRecordController.java
View file @ d826206d
......@@ -2,6 +2,8 @@ package com.mortals.xhx.module.perform.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -11,6 +13,7 @@ import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
import com.mortals.xhx.module.perform.service.PerformComplainRecordService;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 评价绩效投诉记录信息
......@@ -24,6 +27,8 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
public PerformComplainRecordController() {
super.setModuleDesc("评价绩效投诉记录信息");
......@@ -39,7 +44,10 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
this.addDict(model, "complainSource", ReviewSourceEnum.getEnumMap());
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "createUserId", collect);
super.init(model, context);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java
View file @ d826206d
......@@ -3,6 +3,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
......@@ -39,6 +41,8 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
public PerformEffectRecordController(){
super.setModuleDesc( "效能绩效记录信息");
......@@ -53,6 +57,10 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "createUserId", collect);
super.init(model, context);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java
View file @ d826206d
......@@ -3,6 +3,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
......@@ -39,6 +41,8 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
public PerformGoworkRecordController(){
super.setModuleDesc( "办件绩效记录信息");
......@@ -52,6 +56,10 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "createUserId", collect);
super.init(model, context);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java
View file @ d826206d
......@@ -3,6 +3,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
......@@ -39,6 +41,8 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
public PerformOtherRecordController(){
super.setModuleDesc( "其它绩效记录信息");
......@@ -53,6 +57,10 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "createUserId", collect);
super.init(model, context);
}
......
attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java
View file @ d826206d
......@@ -3,6 +3,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
......@@ -39,6 +41,8 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
@Autowired
private ParamService paramService;
@Autowired
private UserService userService;
public PerformReviewRecordController(){
super.setModuleDesc( "评价差评绩效记录信息");
......@@ -56,6 +60,10 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
this.addDict(model, "reviewSource", ReviewSourceEnum.getEnumMap());
Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
.collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
this.addDict(model, "createUserId", collect);
super.init(model, context);
}
......
db/add.sql
View file @ d826206d
......@@ -800,7 +800,7 @@ ALTER TABLE mortals_xhx_attendance_record ADD COLUMN `signOutResult` tinyint(2)
ALTER TABLE mortals_xhx_attendance_record ADD COLUMN `attendType` varchar(128) DEFAULT '0' COMMENT '考勤类型' ;
ALTER TABLE mortals_xhx_attendance_record ADD COLUMN `punchResult` tinyint(2) DEFAULT '0' COMMENT '打卡结果(0.否,1.是)';
ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `signInResult` tinyint(2) DEFAULT '0' COMMENT '签到结果(0.否,1.是)' ;
ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `signInResult` tinyint(2) DEFAULT '0' COMMENT '签到结果(0.否,1.是)' ;
ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `signOutResult` tinyint(2) DEFAULT '0' COMMENT '签退结果(0.否,1.是)';
ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `attendType` varchar(128) DEFAULT '0' COMMENT '考勤类型';
ALTER TABLE mortals_xhx_attendance_record_hik ADD COLUMN `punchResult` tinyint(2) DEFAULT '0' COMMENT '打卡结果(0.否,1.是)';
......
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