fix 资料完善中

master
luoyang 6 years ago
parent 6a84848cc4
commit f67e553a21

@ -48,6 +48,7 @@ public class AppMerchantBean {
private boolean is_valid = false; private boolean is_valid = false;
private String merchant_id; private String merchant_id;
private int status; private int status;
private boolean bd_upload_and_completed = false;
public String getClient_moniker() { public String getClient_moniker() {
return StringUtils.isEmpty(client_moniker) ? null : client_moniker; return StringUtils.isEmpty(client_moniker) ? null : client_moniker;
@ -213,6 +214,9 @@ public class AppMerchantBean {
if (merchant_id != null){ if (merchant_id != null){
param.put("merchant_id",merchant_id); param.put("merchant_id",merchant_id);
} }
if (bd_upload_and_completed) {
param.put("bd_upload_and_completed", true);
}
return param; return param;
} }
@ -477,4 +481,12 @@ public class AppMerchantBean {
public int getStatus() { public int getStatus() {
return status; return status;
} }
public boolean isBd_upload_and_completed() {
return bd_upload_and_completed;
}
public void setBd_upload_and_completed(boolean bd_upload_and_completed) {
this.bd_upload_and_completed = bd_upload_and_completed;
}
} }

@ -140,8 +140,7 @@ public class ManageAppServiceImp implements ManageAppService {
query.setApproving(true); query.setApproving(true);
break; break;
case 3: case 3:
query.setCompleted_contract(true); query.setBd_upload_and_completed(true);
query.setBd_upload_material(true);
break; break;
case 4: case 4:
break; break;

@ -196,6 +196,9 @@
<if test="apply_to_back"> <if test="apply_to_back">
AND c.approve_result = 5 AND c.approve_time is NOT NULL AND c.approve_result = 5 AND c.approve_time is NOT NULL
</if> </if>
<if test="bd_upload_and_completed">
AND ((c.open_status = 3 AND c.approve_result != 5 ) OR ( and c.open_status IS NULL AND c.approve_result IS NULL AND c.source != 4))
</if>
<if test="bd_upload_material"> <if test="bd_upload_material">
AND c.open_status = 3 AND c.approve_result != 5 AND c.open_status = 3 AND c.approve_result != 5
</if> </if>

Loading…
Cancel
Save