@ -120,12 +120,12 @@ public class CollectOrderRequest extends ListPageRequest {
private List<Integer> invAlerts;
/**
*上传状态(1.未上传,2.已上传,3.上传失败)
* 上传状态(1.未上传,2.已上传,3.上传失败)
*/
private Integer uploadStatus;
*上传错误信息
* 上传错误信息
private String updateError;
@ -147,4 +147,6 @@ public class CollectOrderRequest extends ListPageRequest {
private String keywords;
private String excludeWorkCode;
}
@ -62,6 +62,11 @@
<if test="workPlaceCode != null">
AND ico.workPlaceCode = #{workPlaceCode}
</if>
<if test="excludeWorkCode != null and excludeWorkCode != ''">
AND ico.workPlaceCode!=null and ico.workPlaceCode not in (#{excludeWorkCode})
<if test="chargeUser != null">
AND sw.chargeUser = #{chargeUser}