Compare commits
No commits in common. "a14ad08b66b43daa412971992aa34a5dbbb22797" and "cb5cebaa4732dc8594fd3cac8517675bc4f47191" have entirely different histories.
a14ad08b66
...
cb5cebaa47
|
|
@ -601,10 +601,10 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
|
||||||
iXrForceDeregisterResService.saveOrUpdate(xrForceDeregisterRes);
|
iXrForceDeregisterResService.saveOrUpdate(xrForceDeregisterRes);
|
||||||
iXrForceNoticeService.saveOrUpdate(xrForceNotice);
|
iXrForceNoticeService.saveOrUpdate(xrForceNotice);
|
||||||
Map<String, Object> data = new HashMap<>();
|
Map<String, Object> data = new HashMap<>();
|
||||||
String nameByCode = gzaiccodeService.getNameByCode(xrForceSpe.getRegOrg());
|
String nameByCode = gzaiccodeService.getNameByCode(gzaiccodeService.getNameByCode(StringUtils.clearRegionZero(xrForceSpe.getRegOrg())));
|
||||||
data.put("areaName", StringUtils.trimToEmpty(nameByCode));
|
data.put("areaName", StringUtils.trimToEmpty(nameByCode));
|
||||||
data.put("writNo", StringUtils.trimToEmpty(tsWritModel.getWritsno()));
|
data.put("writNo", StringUtils.trimToEmpty(tsWritModel.getWritsno()));
|
||||||
data.put("htmlContent", StringUtils.trimToEmpty(replaceContent));
|
data.put("writContent", StringUtils.trimToEmpty(replaceContent));
|
||||||
LocalDate now = LocalDate.now();
|
LocalDate now = LocalDate.now();
|
||||||
data.put("year", String.valueOf(now.getYear()));
|
data.put("year", String.valueOf(now.getYear()));
|
||||||
data.put("month", String.valueOf(now.getMonthValue() > 9 ? now.getMonthValue() : "0" + now.getMonthValue()));
|
data.put("month", String.valueOf(now.getMonthValue() > 9 ? now.getMonthValue() : "0" + now.getMonthValue()));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue