|
|
@@ -186,10 +186,10 @@ public class AuditServiceImpl implements AuditService {
|
|
|
private void sendCalendarByDone(String id,String userId,String peiXunNeiRong,String starDate,String endDate,String didian,String nameStr,String diDian) throws Exception {
|
|
|
String title = "【"+ peiXunNeiRong +"】的培训通知";
|
|
|
String neiRong = peiXunNeiRong+"培训通知:\n" +
|
|
|
- " 1.培训主题: "+peiXunNeiRong+"\n" +
|
|
|
- " 2.时间安排: 开始时间:"+starDate+" 结束时间:"+endDate+"\n" +
|
|
|
- " 3.培训地点: "+didian+" \n" +
|
|
|
- " 4.参加人员: "+nameStr;
|
|
|
+ " 1.培训主题: "+peiXunNeiRong+"\n" +
|
|
|
+ " 2.时间安排: 开始时间:"+starDate+" 结束时间:"+endDate+"\n" +
|
|
|
+ " 3.培训地点: "+didian+" \n" +
|
|
|
+ " 4.参加人员: "+nameStr;
|
|
|
Map<String, Object> data = new HashMap<>();
|
|
|
data.put("id_", UniqueIdUtil.getId());
|
|
|
data.put("create_by_", ContextUtil.getCurrentUserId());
|
|
|
@@ -334,15 +334,13 @@ public class AuditServiceImpl implements AuditService {
|
|
|
String sql = "select data_ from "+LOG_TABLE+" where id_ ='"+logId+"'";
|
|
|
Map<String,Object> map = commonDao.queryOne(sql);
|
|
|
if (BeanUtils.isNotEmpty(map) && BeanUtils.isNotEmpty(map.get("data_"))){
|
|
|
- //JSONArray jsonArray = JSONUtil.parseArray(map.get("data_").toString());
|
|
|
String replaceSql = map.get("data_").toString().replaceAll("\\\\", "").
|
|
|
replaceAll("\"\\[","[").replaceAll("]\"","]");
|
|
|
//预处理,去除空格和换行符导致json转换失败问题
|
|
|
replaceSql = replaceSql.trim().replace("\r\n", "\\r\\n").replace("\n", "\\n");
|
|
|
JSONArray jsonArray = JsonUtil.parseToArray(replaceSql); //解决json字符串中包含json对象报错问题
|
|
|
// JSONArray jsonArray = JSONUtil.parseArray(replaceSql);
|
|
|
- //JSONArray jsonArray = JSONUtil.parseArray(map.get("data_").toString());
|
|
|
- JSONArray jsonArray = JSONUtil.parseArray(replaceSql);
|
|
|
+// JSONArray jsonArray = JSONUtil.parseArray(map.get("data_").toString());
|
|
|
StringBuilder sqlBuilder = new StringBuilder();
|
|
|
for (int i = 0; i < jsonArray.size(); i++) {
|
|
|
JSONObject jsonObject = jsonArray.getJSONObject(i);
|
|
|
@@ -428,4 +426,4 @@ public class AuditServiceImpl implements AuditService {
|
|
|
return sql.toString();
|
|
|
}
|
|
|
|
|
|
-}
|
|
|
+}
|