提交

孔祥富

2021-03-04 3513da53dffc309a81f6a24c70b90d0cd779c756

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml

@@ -151,6 +151,24 @@
        count(IF(t1.contractStatus = 1 or t1.contractStatus = 2, 1, NULL)) yxht
        FROM
        t_emp_baseinfo t INNER JOIN t_emp_contractinfo t1 on t.empId=t1.empId where 1=1 and t.delFlag=0 and t1.delFlag=0

        <choose>
            <when test="btime!=null and btime!='' and etime!=null and etime!=''">
                and date_format(t1.signingDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.signingDate,'%Y-%m-%d') &lt;= #{etime}
            </when>
            <when test="index==0">
                and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
            </when>
            <when test="index==1">
                and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
            </when>
            <when test="index==2">
                and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
            </when>
            <otherwise>
                and YEAR(t1.signingDate)=YEAR(NOW())
            </otherwise>
        </choose>
    </select>


@@ -671,6 +689,23 @@
            </when>
            <otherwise>
                and (t1.contractStatus = '1' or t1.contractStatus = '2')
                <choose>
                    <when test="btime!='undefined' and btime!=null and btime!='' and etime!='undefined' and etime!=null and etime!=''">
                        and date_format(t1.signingDate,'%Y-%m-%d') &gt;= #{btime}  and date_format(t1.signingDate,'%Y-%m-%d') &lt;= #{etime}
                    </when>
                    <when test="index==0">
                        and TO_DAYS(t1.signingDate) = TO_DAYS(NOW())
                    </when>
                    <when test="index==1">
                        and YEARWEEK(date_format(t1.signingDate,'%Y-%m-%d')) = YEARWEEK(now())
                    </when>
                    <when test="index==2">
                        and date_format(t1.signingDate,'%Y-%m') = date_format(now(),'%Y-%m')
                    </when>
                    <otherwise>
                        and YEAR(t1.signingDate)=YEAR(NOW())
                    </otherwise>
                </choose>
            </otherwise>
        </choose>
        <if test="name!= 'undefined' and name!=null and name!=''">