|
@@ -782,7 +782,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (StringUtils.isNotEmpty(v.getRemark()) && StringUtils.isNotEmpty(m.getSfzst())){
|
|
|
+ if (StringUtils.isNotEmpty(v.getIsZst()) && StringUtils.isNotEmpty(m.getSfzst())){
|
|
|
if (m.getSfzst().trim().equals(DictTypeEnum.ZST_TYPE_YES.getText())){
|
|
|
if (!v.getIsZst().equals(DictTypeEnum.ZST_TYPE_YES.getCode())) {
|
|
|
v.setIsZst(DictTypeEnum.ZST_TYPE_YES.getCode());
|
|
@@ -853,9 +853,6 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
|
|
|
}
|
|
|
|
|
|
if (uflag){
|
|
|
- log.info("旧:{}",JSONObject.toJSONString(o));
|
|
|
- log.info("新:{}",JSONObject.toJSONString(v));
|
|
|
- log.info("参:{}",JSONObject.toJSONString(m));
|
|
|
v.setUpdateBy("system");
|
|
|
v.setUpdateTime(new Date());
|
|
|
if (m.getLastModifiedBy() != null){
|
|
@@ -865,7 +862,7 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
|
|
|
v.setUpdateTime(m.getLastModifiedDate());
|
|
|
}
|
|
|
|
|
|
- // addWorkerRec.add(v);
|
|
|
+ addWorkerRec.add(v);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -883,6 +880,9 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
|
|
|
}
|
|
|
|
|
|
for (ItfTblWangdianWxgDownload m : addRec){
|
|
|
+ /*if (m.getSynReqId().equals(39L)){
|
|
|
+ log.info("tets");
|
|
|
+ }*/
|
|
|
// 已处理过不再处理 因为这里是网点师傅会存在重复数据
|
|
|
if (sfzens.contains(m.getSfzen() + m.getWxgmc() + m.getYddh())){
|
|
|
continue;
|