Merge remote-tracking branch 'origin/develop' into develop

master
eason.qian 7 years ago
commit 71b78e3a77

@ -19,7 +19,6 @@ public class AuditModify extends ClientModify {
private Date approve_time;
private String refuse_remark;
public AuditModify(JSONObject account, String clientMoniker, Integer approve_result, String approver, Date approve_time) {
super(account, clientMoniker);
this.approve_result = approve_result;
@ -35,17 +34,15 @@ public class AuditModify extends ClientModify {
@Override
protected JSONObject getModifyResult() {
JSONObject modify = new JSONObject();
modify.put("approve_result",approve_result);
modify.put("approver",approver);
modify.put("approve_time",approve_time);
if(source!=null){
modify.put("source",source);
}
if(open_status!=null){
modify.put("open_status",open_status);
modify.put("approve_result", approve_result);
modify.put("approver", approver);
modify.put("approve_time", approve_time);
if (source != null) {
modify.put("source", source);
}
if(StringUtils.isNotEmpty(refuse_remark)){
modify.put("refuse_remark",refuse_remark);
modify.put("open_status", open_status);
if (StringUtils.isNotEmpty(refuse_remark)) {
modify.put("refuse_remark", refuse_remark);
}
return modify;
}
@ -66,4 +63,3 @@ public class AuditModify extends ClientModify {
this.approve_result = approve_result;
}
}

@ -30,7 +30,7 @@ public class CustomerImpressionTask {
private ThreadPoolExecutor generatePool = new ThreadPoolExecutor(10, 30, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
@Scheduled(cron = "0 0 3 * * ?")
@Scheduled(cron = "0 0 4 * * ?")
public void generateTags() {
List<JSONObject> clients = clientMapper.listValidClient();
List<List<JSONObject>> splitList = new ArrayList<>();

Loading…
Cancel
Save