Przeglądaj źródła

优化师绩效考核代码逻辑

syh 5 lat temu
rodzic
commit
22e6ded364

+ 0 - 14
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -534,20 +534,6 @@ public class DateUtils extends PropertyEditorSupport {
         return 0;
     }
 
-    public static int getQuarter(Date date) {
-        Calendar calendar = new GregorianCalendar();
-        calendar.setTime(date);
-        return calendar.get(Calendar.MONTH) / 3 + 1;
-    }
-
-    public static void main(String[] args) throws ParseException {
-        Date now = new Date();
-        System.out.println(getQuarterStartDate(now));
-        System.out.println(getQuarterEndDate(now));
-        System.out.println(getYear(now));
-        System.out.println(getQuarter(now));
-    }
-
     public static Map<String, Object> getStartEndTime(String createTime) throws ParseException {
 
         SimpleDateFormat smf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

+ 3 - 0
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/xml/PerformanceMapper.xml

@@ -84,6 +84,9 @@
         <if test="userId != null">
             and sysUser.id = #{userId}
         </if>
+        <if test="projectId != null">
+            and allocation.project_id = #{projectId}
+        </if>
         AND
         dailiAccount.stat_date &gt;= #{startDate}
         AND