|
|
@ -2185,19 +2185,18 @@ |
|
|
and i.PEOPLE_FLAG = #{appealType} |
|
|
and i.PEOPLE_FLAG = #{appealType} |
|
|
</if> |
|
|
</if> |
|
|
<if test="itemState != null and itemState != ''"> |
|
|
<if test="itemState != null and itemState != ''"> |
|
|
|
|
|
and i.ITEM_STATE = #{itemState} |
|
|
|
|
|
</if> |
|
|
|
|
|
<if test="evaluationState != null and evaluationState != ''"> |
|
|
<choose> |
|
|
<choose> |
|
|
<when test="itemState == '80'"> |
|
|
<when test="evaluationState == '80'"> |
|
|
and i.EVALUATION_STATE = '1' |
|
|
and i.EVALUATION_STATE = '1' |
|
|
and i.EVALUATION_TIME IS NULL |
|
|
and i.EVALUATION_TIME IS NULL |
|
|
and i.ITEM_STATE != '10' |
|
|
and i.ITEM_STATE != '10' |
|
|
</when > |
|
|
</when > |
|
|
<when test="itemState == '90'"> |
|
|
<when test="evaluationState == '90'"> |
|
|
and i.EVALUATION_TIME IS NOT NULL |
|
|
and i.EVALUATION_TIME IS NOT NULL |
|
|
and i.ITEM_STATE != '10' |
|
|
|
|
|
</when > |
|
|
</when > |
|
|
<otherwise> |
|
|
|
|
|
and i.ITEM_STATE = #{itemState} |
|
|
|
|
|
</otherwise> |
|
|
|
|
|
</choose> |
|
|
</choose> |
|
|
</if> |
|
|
</if> |
|
|
<if test="deptIdList != null and deptIdList.size() > 0"> |
|
|
<if test="deptIdList != null and deptIdList.size() > 0"> |
|
|
@ -2302,19 +2301,18 @@ |
|
|
and i.PEOPLE_FLAG = #{appealType} |
|
|
and i.PEOPLE_FLAG = #{appealType} |
|
|
</if> |
|
|
</if> |
|
|
<if test="itemState != null and itemState != ''"> |
|
|
<if test="itemState != null and itemState != ''"> |
|
|
|
|
|
and i.ITEM_STATE = #{itemState} |
|
|
|
|
|
</if> |
|
|
|
|
|
<if test="evaluationState != null and evaluationState != ''"> |
|
|
<choose> |
|
|
<choose> |
|
|
<when test="itemState == '80'"> |
|
|
<when test="evaluationState == '80'"> |
|
|
and i.EVALUATION_STATE = '1' |
|
|
and i.EVALUATION_STATE = '1' |
|
|
and i.EVALUATION_TIME IS NULL |
|
|
and i.EVALUATION_TIME IS NULL |
|
|
and i.ITEM_STATE != '10' |
|
|
and i.ITEM_STATE != '10' |
|
|
</when > |
|
|
</when > |
|
|
<when test="itemState == '90'"> |
|
|
<when test="evaluationState == '90'"> |
|
|
and i.EVALUATION_TIME IS NOT NULL |
|
|
and i.EVALUATION_TIME IS NOT NULL |
|
|
and i.ITEM_STATE != '10' |
|
|
|
|
|
</when > |
|
|
</when > |
|
|
<otherwise> |
|
|
|
|
|
and i.ITEM_STATE = #{itemState} |
|
|
|
|
|
</otherwise> |
|
|
|
|
|
</choose> |
|
|
</choose> |
|
|
</if> |
|
|
</if> |
|
|
<if test="deptIdList != null and deptIdList.size() > 0"> |
|
|
<if test="deptIdList != null and deptIdList.size() > 0"> |
|
|
|