Forráskód Böngészése

设计绩效修改提成比例

yangzian 2 éve
szülő
commit
09102baa86

+ 7 - 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -1258,9 +1258,14 @@ public class DateUtils extends PropertyEditorSupport {
      * @return
      * @throws ParseException
      */
-    public static String getYear(String format, String date) throws ParseException {
+    public static String getYear(String format, String date) {
         SimpleDateFormat df = new SimpleDateFormat(format);
-        Date parse = df.parse(date);
+        Date parse = null;
+        try {
+            parse = df.parse(date);
+        }catch (ParseException e) {
+            e.printStackTrace();
+        }
         return String.format("%tY", parse);
     }
 

+ 2 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/achievements/mapper/xml/DesignerMapper.xml

@@ -249,7 +249,8 @@
             u.frozen_time frozenTime,
             IFNULL(u.open_screen_num,0) openHotVideoNum,
             IFNULL(u.pay_salary,0) paySalary,
-            u.remarks
+            u.remarks,
+            u.status
         FROM
             `jeecg-boot`.sys_user u
         WHERE u.id = #{userId}

+ 13 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/achievements/service/impl/DesignerServiceImpl.java

@@ -159,7 +159,7 @@ public class DesignerServiceImpl implements IDesignerService {
      * createTime 员工入职时间
      * @return
      */
-    public Double getMaterialCost(String frozenTime, String createTime,int monthTime){
+    public Double getMaterialCost(String frozenTime, String createTime,int yearTime,int monthTime){
 
 //String frozenTime = "";
         //String createTime = "2022-11-02 12:23:23";
@@ -172,6 +172,12 @@ public class DesignerServiceImpl implements IDesignerService {
          * 人员离职
          */
         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"));
             // 判断时间所在的季度
@@ -205,6 +211,11 @@ public class DesignerServiceImpl implements IDesignerService {
             //return i * cost;
 
         }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"));
             // 判断时间所在的季度
             int quarterTime = DateUtils.getQuarter(date);
@@ -321,7 +332,7 @@ public class DesignerServiceImpl implements IDesignerService {
        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 ? "是" : "否";
        userFrozen.put("materialCostQualifiedFlag",materialCostQualifiedFlag);