yue 5 gadi atpakaļ
vecāks
revīzija
d1969eebe7

+ 11 - 9
src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/ConstructionMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jeeplus.modules.test.activiti.mapper.ConstructionMapper">
+<mapper namespace="com.jeeplus.modules.sg.managementcenter.activiti.mapper.ConstructionMapper">
     
 	<sql id="constructionColumns">
 		a.id AS "id",
@@ -76,10 +76,11 @@
 		INSERT INTO xm_construction_clarificaiton(
 			id,
 			proc_ins_id,
-			leave_type,
-			start_time,
-			end_time,
-			reason,
+			user_name,
+			project_id,
+			project_name,
+			accept_date,
+			examine_date,
 			create_by,
 			create_date,
 			update_by,
@@ -89,10 +90,11 @@
 		) VALUES (
 			#{id},
 			#{procInsId},
-			#{leaveType},
-			#{startTime},
-			#{endTime},
-			#{reason},
+			#{userName},
+			#{projectId},
+			#{projectName},
+			#{acceptDate},
+			#{examineDate},
 			#{createBy.id},
 			#{createDate},
 			#{updateBy.id},

+ 1 - 1
src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -92,7 +92,7 @@ public class ConstructionController extends BaseController {
 			// 启动流程
 			ProcessDefinition p = actProcessService.getProcessDefinition(construction.getAct().getProcDefId());
 			String title = construction.getCurrentUser().getName()+"在"+ DateUtils.getDateTime()+"发起"+p.getName();
-			actTaskService.startProcess(p.getKey(),  "test_activiti_leave", construction.getId(), title);
+			actTaskService.startProcess(p.getKey(),  "xm_construction_clarificaiton", construction.getId(), title);
 			j.setMsg("发起流程审批成功!");
 			j.getBody().put("targetUrl",  "/act/task/process/");
 		}else{

+ 5 - 14
src/main/webapp/webpage/modules/sg/managementcenter/activiti/constructionForm.jsp

@@ -19,10 +19,10 @@
 				}
 			});
 
-			$('#startTime').datetimepicker({
+			$('#acceptDate').datetimepicker({
 				format: "YYYY-MM-DD HH:mm:ss"
 			});
-			$('#endTime').datetimepicker({
+			$('#examineDate').datetimepicker({
 				format: "YYYY-MM-DD HH:mm:ss"
 			});
 			//富文本初始化
@@ -63,11 +63,8 @@
 						<div class="form-group">
 							<label class="col-sm-2 control-label"><font color="red">*</font>申请人:</label>
 							<div class="col-sm-10">
-								<div class='input-group form_datetime' id='userName'>
+								<div class='input-group' id='userName'>
 									<input type='text'  name="startTime" class="form-control required"  value="${construction.userName}"/>
-									<span class="input-group-addon">
-									<span class="glyphicon glyphicon-calendar"></span>
-									</span>
 								</div>
 							</div>
 						</div>
@@ -75,11 +72,8 @@
 						<div class="form-group">
 							<label class="col-sm-2 control-label"><font color="red">*</font>项目号:</label>
 							<div class="col-sm-10">
-								<div class='input-group form_datetime' id='projectId'>
+								<div class='input-group' id='projectId'>
 									<input type='text'  name="startTime" class="form-control required"  value="${construction.projectId}"/>
-									<span class="input-group-addon">
-									<span class="glyphicon glyphicon-calendar"></span>
-									</span>
 								</div>
 							</div>
 						</div>
@@ -87,11 +81,8 @@
 						<div class="form-group">
 							<label class="col-sm-2 control-label"><font color="red">*</font>项目名称:</label>
 							<div class="col-sm-10">
-								<div class='input-group form_datetime' id='projectName'>
+								<div class='input-group form-control' id='projectName'>
 									<input type='text'  name="startTime" class="form-control required"  value="${construction.projectName}"/>
-									<span class="input-group-addon">
-									<span class="glyphicon glyphicon-calendar"></span>
-									</span>
 								</div>
 							</div>
 						</div>