wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-09-23 17:40:49 +08:00
parent 8c9ca5f38c
commit 76e6dd840c
6 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/lz/common/utils/Constant.java
View File

@ -8,6 +8,8 @@
package com.lz.common.utils;
import sun.jvm.hotspot.oops.ShortField;
/**
* 常量
*
@ -173,4 +175,6 @@ public class Constant {
public static final String OSS_BUCCKET = "my-wallet";
public static final Integer TWO = 2;
public static final Integer ONE = 1;
public static final String WENHUAJIAZHIGUAN = "<p>做人：相信、包容、担当&nbsp;</p><p>做事：用户第一、求真、极致<br></p>";
public static final String WENHUAJIAZHIGUAN_TARGET = "<p>做人：相信、包容、担当&nbsp; 3.5分</p>1、尊重合作伙伴，坚决维护公司形象<br>2、倾听不同意见，积极参加各类公司项目活动，通过正确渠道（直属上级/部门负责人/HR）反馈问题提出改进意见；决策前充分讨论，决策后无论个人是否有异议，必须从言行上完全予以支持<br>3、严格遵守公司规章制度，遇事不推诿、不甩锅，勇于承担责任<br>4、实事求是，诚实守信，独立自主思考，珍惜彼此时间无需他人监督催促，客观反馈问题，遇到bug/工作问题，以查到底<br>5、今日事今日毕，按时汇报工作，今天的表现是明天最低的要求，不断追求更好的结果<br>6、以客户为中心，提供专业服务，做好公司内外部协作，无实质投诉<br>3.75分<br>1、拥抱变化，对公司不同层面的调整，持乐见状态，并予以高度支持配合<br>2、以团队目标为导向，包容不同类型的伙伴，不将个人喜好带入工作，接受更优秀的人才与思想，取长补短，互相成就<br>3、勇于接受挑战承担责任，为实现目标全力以赴，主动分享业务知识与经验，正面影响团队，改善团队士气与氛围<br>4、深入理解公司业务与部门协作方式，保持好奇心，以结果倒推需求，持续思考“为什么做”，辩证思考执行，保证大方向的正确与工作方式的持续迭代<br>5、对日常工作有极致要求，多角度对问题进行辩证探究，不钻牛角尖不随风摇摆，以最佳结果为导向持续倒逼更优方案<br>6、辨证看待用户意见，要以“用户为师”的心态坚持原则寻求解决，最终达到用户和公司都受益的结果";
}

12
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -154,7 +154,7 @@ public class ResultRecordController extends AbstractController {
@RequestMapping("/getStaffResultDetail")
public R getStaffResultDetail(ResultRecordReq req) {
int yeJiCheckNum = 0;
int wenHuaJiaZhiGuanNum = 0;
int wenHuaJiaZhiGuanNum = 1;
int lastResultNum = 2;
int commentNum = 0;
int recordType = req.getRecordType();
@ -228,18 +228,14 @@ public class ResultRecordController extends AbstractController {
list.add(resp);
}
if (tempType2 == 0) {
wenHuaJiaZhiGuanNum = 2;
list.add(resultDetailService.getYeJiKaoHe(BigDecimal.ZERO));
list.add(resultDetailService.getWenHuaJiaZhiGua1(auth));
list.add(resultDetailService.getWenHuaJiaZhiGua2(auth));
}
} else {
yeJiCheckNum = 1;
wenHuaJiaZhiGuanNum = 2;
list.add(resultDetailService.getYeJi());
list.add(resultDetailService.getYeJiKaoHe(BigDecimal.ZERO));
list.add(resultDetailService.getWenHuaJiaZhiGua1(auth));
list.add(resultDetailService.getWenHuaJiaZhiGua2(auth));
}
list.add(resultDetailService.getWenHuaJiaZhiGuaResult1(sumWenHuaJiaZhiGuan));
list.add(resultDetailService.getWenHuaJiaZhiGuaResult2());
@ -529,12 +525,18 @@ public class ResultRecordController extends AbstractController {
ResultDetail old = resultDetailService.selectResultDetailById(req.getId());
if (old != null) {
com.lz.modules.app.utils.BeanUtils.copyProperty(old, req, false);
if(old.getType().equals(2)){
old.setTarget(Constant.WENHUAJIAZHIGUAN);
}
resultDetailService.updateResultDetailById(old);
} else {
ResultDetail resultDetail = new ResultDetail();
BeanUtils.copyProperties(req, resultDetail);
resultDetail.setRecordId(resultRecord.getId());
resultDetail.setStaffId(resultRecord.getStaffId());
if(req.getType().equals(2)){
resultDetail.setTarget(Constant.WENHUAJIAZHIGUAN);
}
resultDetailService.insertResultDetail(resultDetail);
}
List<ResultDetail> resultDetails = resultDetailService.selectByRecordId(resultRecord.getId());

4
src/main/java/com/lz/modules/app/enums/FlowNodeEnum.java
View File

@ -32,4 +32,8 @@ public enum FlowNodeEnum {
public void setDesc(String desc) {
this.desc = desc;
}
public static void main(String[] args) {
System.out.println(FlowNodeEnum.endNode.desc);
}
}

2
src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java
View File

@ -56,7 +56,7 @@ public interface ResultDetailService extends IService<ResultDetail> {
ResultDetailResp getLastResult(BigDecimal bigDecimal);
void insertWenHuaJiaZhiGua(String s, Long id, Long userId);
void insertWenHuaJiaZhiGua(String s, Long id, Long userId,BigDecimal checkWeight);
String initRole(Long staffId, Long l);

12
src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.lz.modules.sys.service.app.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lz.common.utils.BigDecimalUtil;
import com.lz.common.utils.Constant;
import com.lz.common.utils.StringUtil;
import com.lz.modules.app.entity.StaffEntity;
import com.lz.modules.app.resp.ResultDetailResp;
@ -139,17 +140,17 @@ public class ResultDetailServiceImpl extends ServiceImpl<ResultDetailMapper, Res
public ResultDetailResp getWenHuaJiaZhiGua1(Auth auth) {
ResultDetailResp wenhua1 = new ResultDetailResp();
wenhua1.setCheckRange("文化价值观");
wenhua1.setTarget("做人：相信、包容、担当");
wenhua1.setTarget("做人：相信、包容、担当\n 做事：用户第一、求真、极致");
wenhua1.setType(2);
wenhua1.setIsEdit(auth.getWenHuaEdit());
wenhua1.setCheckWeight(new BigDecimal(0.15));
wenhua1.setCheckWeight(new BigDecimal(0.3));
return wenhua1;
}
public ResultDetailResp getWenHuaJiaZhiGua2(Auth auth) {
ResultDetailResp wenhua2 = new ResultDetailResp();
wenhua2.setCheckRange("文化价值观");
wenhua2.setTarget("做事：用户第一、求真、极致");
wenhua2.setTarget("");
wenhua2.setType(2);
wenhua2.setIsEdit(auth.getWenHuaEdit());
wenhua2.setCheckWeight(new BigDecimal(0.15));
@ -190,13 +191,14 @@ public class ResultDetailServiceImpl extends ServiceImpl<ResultDetailMapper, Res
public void insertWenHuaJiaZhiGua(String target, Long recordId, Long staffId) {
public void insertWenHuaJiaZhiGua(String target, Long recordId, Long staffId,BigDecimal checkWeight) {
ResultDetail wenhua1 = new ResultDetail();
wenhua1.setTarget(target);
wenhua1.setType(2);
wenhua1.setCheckWeight(new BigDecimal(0.15));
wenhua1.setCheckWeight(checkWeight);
wenhua1.setStaffId(staffId);
wenhua1.setRecordId(recordId);
wenhua1.setKeyResult(Constant.WENHUAJIAZHIGUAN_TARGET);
insertResultDetail(wenhua1);
}

3
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -378,8 +378,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
resultRecordNew = resultRecordService.createResultRecord(staffId, recordType, roleId);
}
//保存文件价值观
resultDetailService.insertWenHuaJiaZhiGua("做人：相信、包容、担当", resultRecordNew.getId(), staffId);
resultDetailService.insertWenHuaJiaZhiGua("做事：用户第一、求真、极致", resultRecordNew.getId(), staffId);
resultDetailService.insertWenHuaJiaZhiGua(Constant.WENHUAJIAZHIGUAN, resultRecordNew.getId(), staffId,new BigDecimal(0.3));
return resultRecordNew;
}