流程配置增加注意事项，在小程序中发起流程时红色字体醒目展示

src/main/bpm/com/yw/bpm/client/action/BpmClientGetStartFlowInfoAction.java

@@ -81,6 +81,7 @@ public class BpmClientGetStartFlowInfoAction extends RequestAbs {
 				FlowModel fmodel = (FlowModel) result.get("fmodel");
 				flowMap.put("modelId", fmodel.getModelId());
 				flowMap.put("formId", fmodel.getFormId().getFormId());
+				flowMap.put("precautions", fmodel.getPrecautions());
 
 				TacheModel tmodel = (TacheModel) result.get("tmodel");
 				flowMap.put("tmodelId", tmodel.getTmodelId());
@@ -142,6 +143,7 @@ public class BpmClientGetStartFlowInfoAction extends RequestAbs {
 				FlowModel fmodel = (FlowModel) result.get("fmodel");
 				flowMap.put("modelId", fmodel.getModelId());
 				flowMap.put("formId", fmodel.getFormId().getFormId());
+				flowMap.put("precautions", fmodel.getPrecautions());
 
 				TacheModel tmodel = (TacheModel) result.get("tmodel");
 				flowMap.put("tmodelId", tmodel.getTmodelId());

src/main/bpm/com/yw/bpm/configuration/action/ModelConfigAction.java

@@ -181,6 +181,8 @@ public class ModelConfigAction extends BaseAction {
 		flowModel.setModelId(modelId);
 		flowModel.setModelName(map.get("modelName"));
 		flowModel.setAbbreviation(map.get("abbreviation"));
+		flowModel.setRemark(map.get("remark"));
+		flowModel.setPrecautions(map.get("precautions"));
 		flowModel.getTypeId().setTypeId(map.get("typeId"));
 		flowModel.getState().setValue(map.get("modelState"));
 		flowModel.getCreator().setUserId(String.valueOf(oasession.getLoginID()));

src/main/bpm/com/yw/bpm/flow/dao/FlowModelDaoImpl.java

@@ -55,7 +55,7 @@ public class FlowModelDaoImpl extends BaseDao implements FlowModelDao {
 			.append("e.v_data_name as n_cancel_can_read_name, f.v_type_name, ")
 			.append("g.v_data_name as n_control_name, h.v_data_name as n_is_sms_name, ")
 			.append("i.v_data_name as n_is_email_name, j.v_data_name as n_is_message_name, ")
-			.append("k.groupname, l.v_data_name,t.model_picture, t.abbreviation ")
+			.append("k.groupname, l.v_data_name,t.model_picture, t.abbreviation, t.v_precautions ")
 			.append("from bpm_flow_model t ")
 			.append("left join bpm_data a on t.n_has_office=a.n_value and a.v_data_field='n_has_office' and a.v_data_table='flow_model' ")
 			.append("left join t_user b on t.v_creator=b.universalid ")
@@ -106,9 +106,9 @@ public class FlowModelDaoImpl extends BaseDao implements FlowModelDao {
 				.append("n_has_office, n_is_cancel, n_cancel_can_read, ")
 				.append("n_end_cancel, v_allow_cancels, n_is_sms, ").append("n_is_email, n_is_message, n_is_graph, ")
 				.append("n_is_view_limit, n_limit_use_type, v_limit_use, ")
-				.append("n_limit_position_type, v_limit_position_dept,n_is_custom_print,n_statistics,v_attachment_template,n_allow_skip_tache,abbreviation")
+				.append("n_limit_position_type, v_limit_position_dept,n_is_custom_print,n_statistics,v_attachment_template,n_allow_skip_tache,abbreviation,v_precautions")
 				.append(") values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ")
-				.append("?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )");
+				.append("?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )");
 		List<Object> args = new ArrayList<Object>();
 		args.add(flowModel.getModelId());
 		args.add(flowModel.getModelName());
@@ -140,13 +140,14 @@ public class FlowModelDaoImpl extends BaseDao implements FlowModelDao {
 		args.add(flowModel.getAttachmentTemplate());
 		args.add(flowModel.getAllowSkipTache());
 		args.add(flowModel.getAbbreviation());
+		args.add(flowModel.getPrecautions());
 		return jdbcTemplate.update(sql.toString(), args.toArray());
 	}
 
 	@Override
 	public int editFlowModel(FlowModel flowModel) {
 		StringBuffer sql = new StringBuffer("update bpm_flow_model set ")
-				.append("v_model_name=?, l_type_id=?, v_remark=?, ")
+				.append("v_model_name=?, l_type_id=?, v_remark=?, v_precautions=?, ")
 				.append("n_has_office=?, n_is_cancel=?, n_end_cancel=?, ")
 				.append("n_control=?, n_control_url=?, n_cancel_can_read=?, v_allow_cancels=?, ")
 				.append("n_is_email=?, n_is_message=?, n_is_sms=?, ")
@@ -156,6 +157,7 @@ public class FlowModelDaoImpl extends BaseDao implements FlowModelDao {
 		args.add(flowModel.getModelName());
 		args.add(flowModel.getTypeId().getTypeId());
 		args.add(flowModel.getRemark());
+		args.add(flowModel.getPrecautions());
 		args.add(flowModel.getHasOffice().getValue());
 		args.add(flowModel.getIsCancel().getValue());
 		args.add(flowModel.getEndCancel().getValue());
@@ -892,7 +894,7 @@ public class FlowModelDaoImpl extends BaseDao implements FlowModelDao {
 				.append(" t.n_has_office, t.n_end_cancel, t.v_creator, t.v_remark, t.v_dept, t.n_control, t.n_control_url,t.n_is_default,")
 				.append(" t.l_form_id, t.v_limit_position_dept, t.v_allow_cancels, t.n_is_graph, t.n_is_view_limit, t.n_cancel_can_read,")
 				.append(" t.n_is_sms, t.n_is_email, t.n_is_message, t.n_limit_use_type, t.v_limit_use, t.n_limit_position_type,t.n_is_custom_print,")
-				.append(" t.n_statistics, t.v_attachment_template,t.n_allow_skip_tache ")
+				.append(" t.n_statistics, t.v_attachment_template,t.n_allow_skip_tache, t.v_precautions ")
 				.append(" from bpm_form_info f")
 				.append(" left join bpm_flow_model t on f.l_model_id = t.l_model_id").append(" where f.l_form_id=?");
 		List<Object> args = new ArrayList<Object>();
@@ -915,6 +917,7 @@ public class FlowModelDaoImpl extends BaseDao implements FlowModelDao {
 				flowModel.setAllowCancels(rs.getString("v_allow_cancels"));
 				flowModel.getIsSms().setValue(rs.getString("n_is_sms"));
 				flowModel.setAllowSkipTache(rs.getString("n_allow_skip_tache"));
+				flowModel.setPrecautions(rs.getString("v_precautions"));
 				return flowModel;
 			}
 		};

src/main/bpm/com/yw/bpm/flow/mapper/FlowModelMapper.java

@@ -69,6 +69,7 @@ public class FlowModelMapper implements RowMapper {
 		flowModel.setAttachmentTemplate(rs.getString("v_attachment_template"));
 		flowModel.setAllowSkipTache(rs.getString("n_allow_skip_tache"));
 		flowModel.setAbbreviation(rs.getString("abbreviation"));
+		flowModel.setPrecautions(rs.getString("v_precautions"));
 		return flowModel;
 	}
 

src/main/bpm/com/yw/bpm/flow/model/FlowModel.java

@@ -45,6 +45,10 @@ public class FlowModel {
 	 * 流程模版备注
 	 */
 	private String remark;
+	/**
+	 * 注意事项
+	 */
+	private String precautions;
 
 	/**
 	 * 流程模版所属部门
@@ -660,4 +664,12 @@ public class FlowModel {
 	public void setAbbreviation(String abbreviation) {
 		this.abbreviation = abbreviation;
 	}
+
+	public String getPrecautions() {
+		return precautions;
+	}
+
+	public void setPrecautions(String precautions) {
+		this.precautions = precautions;
+	}
 }

src/main/bpm/com/yw/bpm/instance/dao/FlowDaoImpl.java

@@ -189,7 +189,7 @@ public class FlowDaoImpl implements FlowDao {
 			.append("t.d_createdate, t.d_canceldate, t.d_finishdate, ").append("c.v_allow_cancels, c.v_model_name, c.v_short_name, ")
 			.append("c.n_is_cancel, c.n_end_cancel, c.n_cancel_can_read, ")
 			.append("(case when t.n_control is not null then t.n_control else c.n_control end ) as n_control,")
-			.append(" c.n_control_url,c.n_custom_cancel,c.abbreviation, ")
+			.append(" c.n_control_url,c.n_custom_cancel,c.abbreviation,c.v_precautions, ")
 			.append("t.l_form_ins_id, t.l_form_id, t.l_file_id, ")
 			.append("t.l_tache_ins_start, t.l_groupid, t.l_office_id, ")
 			.append("t.l_groupxuserid, v_cancelremark, t.l_pdf_id, e.state,GROUP_CONCAT(f.`name`) tache_current_user_name,g.l_serial_no,c.n_is_custom_print  ")
@@ -222,7 +222,7 @@ public class FlowDaoImpl implements FlowDao {
 			.append("t.n_state, a.v_data_name as dataName, ").append("t.v_creator, b.name, ").append("t.d_createdate, t.d_canceldate, t.d_finishdate, ").append("c.v_allow_cancels, c.v_model_name,c.v_short_name, ")
 			.append("c.n_is_cancel, c.n_end_cancel, c.n_cancel_can_read, ")
 			.append("case when t.n_control is not null then t.n_control else c.n_control end,")
-			.append(" c.n_control_url, ")
+			.append(" c.n_control_url,c.v_precautions, ")
 			.append("t.l_form_ins_id, t.l_form_id, t.l_file_id, ")
 			.append("t.l_tache_ins_start, t.l_groupid, t.l_office_id, ")
 			.append("t.l_groupxuserid, v_cancelremark, e.state ")

src/main/bpm/com/yw/bpm/instance/mapper/FlowInstanceMapper.java

@@ -76,6 +76,9 @@ public class FlowInstanceMapper implements RowMapper {
 		if( this.isExistColumn(rs,"abbreviation") ){
 			instance.getModelId().setAbbreviation(rs.getString("abbreviation"));
 		}
+		if( this.isExistColumn(rs,"v_precautions") ){
+			instance.getModelId().setPrecautions(rs.getString("v_precautions"));
+		}
 		return instance;
 	}
 

src/main/webapp/yw/bpm/configuration/flow/model.jsp

@@ -32,6 +32,8 @@ function backValue(){
 		$("#modelName").val(modelName); 
 		var remark = "${requestScope.fmodel.remark }";
 		$("#remark").val(remark); 
+		var precautions = "${requestScope.fmodel.precautions }";
+		$("#precautions").val(precautions); 
 		var typeId = "${requestScope.fmodel.typeId.typeId }";
 		$("#typeId").val(typeId);
 		var abbreviation = "${requestScope.fmodel.abbreviation }";
@@ -278,6 +280,15 @@ function changeControl(){
 						maxlength="200"></textarea>
 				</div>
 			</div>
+			<div class="form-group">
+				<label class="col-sm-4 control-label">注意事项
+					<span class="badge badge-success" title="配置流程模版的注意事项.">?</span>
+				</label>
+				<div class="col-sm-8">
+					<textarea class="form-control" rows="5" id="precautions" name="precautions"
+						maxlength="500"></textarea>
+				</div>
+			</div>
 			<div class="form-group">
 				<label class="col-sm-4 control-label">所属栏目
 					<span class="badge badge-success" title="配置该流程模版的归属栏目.流程模版启动后,在发起流程的页面,对应的栏目下可以找到该流程.">?</span>