Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
22d63b5d1b
|
|
@ -253,10 +253,10 @@
|
|||
and etu.pro_id = #{proId}
|
||||
</if>
|
||||
<if test="type == '1' or type == 1">
|
||||
and etu.sign_time is not null and etu.sign_time != '' and etu.sign_time != 'null'
|
||||
and etu.sign_time is not null
|
||||
</if>
|
||||
<if test="type == '2' or type == 2">
|
||||
and (etu.sign_time is null or etu.sign_time = '' or etu.sign_time = 'null')
|
||||
AND etu.sign_time IS NULL
|
||||
</if>
|
||||
</select>
|
||||
<select id="getExamCount" resultType="java.lang.Integer">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package com.bonus.flowable.listener;
|
||||
|
||||
import com.bonus.flowable.service.BusinessService;
|
||||
import com.sun.javafx.collections.MappingChange;
|
||||
import org.flowable.bpmn.model.ExtensionAttribute;
|
||||
import org.flowable.bpmn.model.FlowElement;
|
||||
import org.flowable.bpmn.model.UserTask;
|
||||
|
|
|
|||
Loading…
Reference in New Issue