From 76e6dd840cbb2ed2296e382e6b7e0e042adf8189 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Wed, 23 Sep 2020 17:40:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/lz/common/utils/Constant.java | 4 ++++
.../app/controller/ResultRecordController.java | 12 +++++++-----
.../java/com/lz/modules/app/enums/FlowNodeEnum.java | 4 ++++
.../modules/sys/service/app/ResultDetailService.java | 2 +-
.../service/app/impl/ResultDetailServiceImpl.java | 12 +++++++-----
.../service/app/impl/ResultRecordServiceImpl.java | 3 +--
6 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/lz/common/utils/Constant.java b/src/main/java/com/lz/common/utils/Constant.java
index 4bb7f175..45a67c5f 100644
--- a/src/main/java/com/lz/common/utils/Constant.java
+++ b/src/main/java/com/lz/common/utils/Constant.java
@@ -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 = "做人：相信、包容、担当
做事：用户第一、求真、极致
";
+ public static final String WENHUAJIAZHIGUAN_TARGET = "做人：相信、包容、担当 3.5分
1、尊重合作伙伴，坚决维护公司形象
2、倾听不同意见，积极参加各类公司项目活动，通过正确渠道（直属上级/部门负责人/HR）反馈问题提出改进意见；决策前充分讨论，决策后无论个人是否有异议，必须从言行上完全予以支持
3、严格遵守公司规章制度，遇事不推诿、不甩锅，勇于承担责任
4、实事求是，诚实守信，独立自主思考，珍惜彼此时间无需他人监督催促，客观反馈问题，遇到bug/工作问题，以查到底
5、今日事今日毕，按时汇报工作，今天的表现是明天最低的要求，不断追求更好的结果
6、以客户为中心，提供专业服务，做好公司内外部协作，无实质投诉
3.75分
1、拥抱变化，对公司不同层面的调整，持乐见状态，并予以高度支持配合
2、以团队目标为导向，包容不同类型的伙伴，不将个人喜好带入工作，接受更优秀的人才与思想，取长补短，互相成就
3、勇于接受挑战承担责任，为实现目标全力以赴，主动分享业务知识与经验，正面影响团队，改善团队士气与氛围
4、深入理解公司业务与部门协作方式，保持好奇心，以结果倒推需求，持续思考“为什么做”，辩证思考执行，保证大方向的正确与工作方式的持续迭代
5、对日常工作有极致要求，多角度对问题进行辩证探究，不钻牛角尖不随风摇摆，以最佳结果为导向持续倒逼更优方案
6、辨证看待用户意见，要以“用户为师”的心态坚持原则寻求解决，最终达到用户和公司都受益的结果";
}
diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
index 5df40909..da9b9341 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -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 resultDetails = resultDetailService.selectByRecordId(resultRecord.getId());
diff --git a/src/main/java/com/lz/modules/app/enums/FlowNodeEnum.java b/src/main/java/com/lz/modules/app/enums/FlowNodeEnum.java
index e2551d07..d5f6cc47 100644
--- a/src/main/java/com/lz/modules/app/enums/FlowNodeEnum.java
+++ b/src/main/java/com/lz/modules/app/enums/FlowNodeEnum.java
@@ -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);
+ }
}
diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java b/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java
index 2bc7186a..af396fe7 100644
--- a/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java
+++ b/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java
@@ -56,7 +56,7 @@ public interface ResultDetailService extends IService {
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);
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
index ae93f0db..d5d8afed 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
@@ -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