Projects >> bc-framework >>478cc2a50bd574892e00faba129a6877893bf552

Chunk
Conflicting content 
		String code = form.getCode();
		Long pid = form.getPid();
		String subject = form.getSubject();
<<<<<<< HEAD
		String tpl = form.getTpl();
		
=======

>>>>>>> 35e4de487b87fa87c1f1a62660bb98208fe0965e
		args.put("context", context);
		args.put("form_author", author.getName());
		args.put("form_fileDate", fileDate);
Solution content 
		String code = form.getCode();
		Long pid = form.getPid();
		String subject = form.getSubject();

		args.put("context", context);
		args.put("form_author", author.getName());
		args.put("form_fileDate", fileDate);
File
CustomFormEntityAction.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		args.put("form_pid", pid);
		args.put("form_subject", subject);
		args.put("form_id", id);
<<<<<<< HEAD
		args.put("form_tpl", tpl);
=======
	}

	/**
	 * 新建编辑时设置表单信息
	 * 
	 * @param form
	 * @throws JSONException
	 */
	private String setEditedFormInfo(Form form) throws JSONException {
		ActorHistory author = form.getAuthor();
		ActorHistory modifier = form.getModifier();
		String fileDate = DateUtils.formatCalendar2Second(form.getFileDate());
		String modifiedDate = DateUtils.formatCalendar2Second(form
				.getModifiedDate());
		String uid = form.getUid();
		String type = form.getType();
		String code = form.getCode();
		Long pid = form.getPid();
		String subject = form.getSubject();
>>>>>>> 35e4de487b87fa87c1f1a62660bb98208fe0965e

		// 设置${from_info}参数对应的值
		JSONObject infoJson = new JSONObject();
Solution content 
		args.put("form_pid", pid);
		args.put("form_subject", subject);
		args.put("form_id", id);
		args.put("form_tpl", tpl);

	/**
	 * 新建编辑时设置表单信息
	 * 
	 * @param form
	 * @throws JSONException
	 */
	private String setEditedFormInfo(Form form) throws JSONException {
		ActorHistory author = form.getAuthor();
		ActorHistory modifier = form.getModifier();
		String fileDate = DateUtils.formatCalendar2Second(form.getFileDate());
		String modifiedDate = DateUtils.formatCalendar2Second(form
				.getModifiedDate());
		String uid = form.getUid();
		String type = form.getType();
		String code = form.getCode();
		Long pid = form.getPid();
		String subject = form.getSubject();

		// 设置${from_info}参数对应的值
		JSONObject infoJson = new JSONObject();
File
CustomFormEntityAction.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation
Method signature
Variable
Chunk
Conflicting content 
		infoJson.put("tpl", tpl);
		infoJson.put("subject", subject);
		infoJson.put("id", id);
<<<<<<< HEAD
		infoJson.put("tpl", tpl);
		args.put("form_info", infoJson.toString());

		// 获取表单字段属性
		List fields = this.fieldService.findList(form);
		if (fields != null && fields.size() != 0) {
			for (Field f : fields) {
				args.put(
						f.getName(),
						StringUtils.convertValueByType(f.getType(),
								f.getValue()));
			}
		}
=======
>>>>>>> 35e4de487b87fa87c1f1a62660bb98208fe0965e

		return infoJson.toString();
	}
Solution content 
		infoJson.put("tpl", tpl);
		infoJson.put("subject", subject);
		infoJson.put("id", id);

		return infoJson.toString();
	}
File
CustomFormEntityAction.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation
Variable