|
@@ -159,7 +159,7 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
* createTime 员工入职时间
|
|
* createTime 员工入职时间
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- public Double getMaterialCost(String frozenTime, String createTime,int monthTime){
|
|
|
|
|
|
+ public Double getMaterialCost(String frozenTime, String createTime,int yearTime,int monthTime){
|
|
|
|
|
|
//String frozenTime = "";
|
|
//String frozenTime = "";
|
|
//String createTime = "2022-11-02 12:23:23";
|
|
//String createTime = "2022-11-02 12:23:23";
|
|
@@ -172,6 +172,12 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
* 人员离职
|
|
* 人员离职
|
|
*/
|
|
*/
|
|
if (frozenTime != null){
|
|
if (frozenTime != null){
|
|
|
|
+ String yearF = DateUtils.getYear("yyyy-MM-dd", frozenTime);
|
|
|
|
+ if (!yearF.equals(String.valueOf(yearTime))){
|
|
|
|
+ log.info("离职-----离职时间是:{},查询季度{} 绩效按照0计算。",frozenTime,monthTime);
|
|
|
|
+ return 0 * cost;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
Date date = DateUtils.str2Date(frozenTime,new SimpleDateFormat("yyyy-MM-dd"));
|
|
Date date = DateUtils.str2Date(frozenTime,new SimpleDateFormat("yyyy-MM-dd"));
|
|
// 判断时间所在的季度
|
|
// 判断时间所在的季度
|
|
@@ -205,6 +211,11 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
//return i * cost;
|
|
//return i * cost;
|
|
|
|
|
|
}else {
|
|
}else {
|
|
|
|
+ String yearC = DateUtils.getYear("yyyy-MM-dd", createTime);
|
|
|
|
+ if (!yearC.equals(String.valueOf(yearTime))){
|
|
|
|
+ log.info("在职-----入职时间是:{},查询季度{} 绩效按照240计算。",createTime,monthTime);
|
|
|
|
+ return i * cost;
|
|
|
|
+ }
|
|
Date date = DateUtils.str2Date(createTime,new SimpleDateFormat("yyyy-MM-dd"));
|
|
Date date = DateUtils.str2Date(createTime,new SimpleDateFormat("yyyy-MM-dd"));
|
|
// 判断时间所在的季度
|
|
// 判断时间所在的季度
|
|
int quarterTime = DateUtils.getQuarter(date);
|
|
int quarterTime = DateUtils.getQuarter(date);
|
|
@@ -321,7 +332,7 @@ public class DesignerServiceImpl implements IDesignerService {
|
|
String createTime = userFrozen.getString("createTime");
|
|
String createTime = userFrozen.getString("createTime");
|
|
|
|
|
|
//判断素材消耗是否达标
|
|
//判断素材消耗是否达标
|
|
- Double i = getMaterialCost(frozenTime,createTime,Integer.valueOf(monthTime));
|
|
|
|
|
|
+ Double i = getMaterialCost(frozenTime,createTime,Integer.valueOf(yearTime),Integer.valueOf(monthTime));
|
|
String materialCostQualifiedFlag = tatolCost >= i ? "是" : "否";
|
|
String materialCostQualifiedFlag = tatolCost >= i ? "是" : "否";
|
|
userFrozen.put("materialCostQualifiedFlag",materialCostQualifiedFlag);
|
|
userFrozen.put("materialCostQualifiedFlag",materialCostQualifiedFlag);
|
|
|
|
|