Merge branch 'master' of http://192.168.2.4:3000/chengqiang/sg_audit

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/ConstructionMapper.xml

@@ -16,27 +16,7 @@
 		a.update_date AS "updateDate",
 		a.remarks AS "remarks",
 		a.del_flag AS "delFlag",
-		a.applyName,
-		a.powerLine,
-		a.blackoutArea,
-		a.projectType,
-		a.powerFailure,
-		a.preliminaryJudgment,
-		a.civilEngineering,
-		a.baseType,
-		a.planApproval,
-		a.transformationType,
-		a.transformationEquipment,
-		a.newNamed,
-		a.putInto,
-		a.electricalConstruction,
-		a.theAssignment,
-		a.automation,
-		a.remote,
-		a.communicationMode,
-		a.inSitu,
-		a.networkCabinet,
-		a.station
+		a.applyName
 	</sql>
 
     <sql id="disclose">
@@ -74,9 +54,29 @@
     <select id="get" resultMap="ConstructionResult">
         SELECT
         <include refid="constructionColumns"/>,
-        <include refid="disclose"/>
-        FROM xm_construction_clarificaiton a
-		LEFT JOIN xm_disclose_conclusion b on a.proc_ins_id=b.proc_ins_id
+		b.power_line AS "powerLine",
+		b.power_scope AS "blackoutArea",
+		b.project_type AS "projectType",
+		b.power_flag_package AS "powerFailure",
+		b.preliminary_judgment AS "preliminaryJudgment",
+		b.flag_civil_engineering AS "civilEngineering",
+		b.steel_tube_pole AS "baseType",
+		b.flag_approval_planning AS "planApproval",
+		b.equ_create_type AS "transformationType",
+		b.equ_create_size AS "transformationEquipment",
+		b.flag_new_equ_name AS "newNamed",
+		b.include_bdz_news AS "putInto",
+		b.flag_no_electrical AS "electricalConstruction",
+		b.drawings_work AS "theAssignment",
+		b.flag_automation AS "automation",
+		b.two_and_three_remote AS "remote",
+		b.phone_style AS "communicationMode",
+		b.stay_open_area AS "inSitu",
+		b.ring_network_cabinet AS "networkCabinet",
+		b.station_dtu AS "station",
+		b.status As "status"
+		FROM xm_construction_clarificaiton a
+		LEFT JOIN xm_project_details b on a.project_id=b.id
 		WHERE a.id = #{id}
     </select>
 

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

@@ -170,6 +170,8 @@ public class ConstructionController extends BaseController {
          */
 
     if (StringUtils.isBlank(construction.getId())) {
+        //获取流程图id
+        String procDefId = construction.getAct().getProcDefId();
         //用于记录未发起的流程原因
         String info = "";
         //用户修改发起流程后的项目状态
@@ -209,13 +211,14 @@ public class ConstructionController extends BaseController {
                         construction.setApplyName(constructionUnitRole);
                         construction.setProjectId(id);
                         construction.setProjectName(each.getRequireName());
+                        construction.setAcceptDate(new Date());
                         constructionService.newSave(construction);//保存
                         newProject.setStatus("1");
-                        newProject.setProjectId(id);
+                        newProject.setId(id);
                         projectService.updateStatus(newProject);
                         String procDefKey = construction.getAct().getProcDefKey();
                         // 启动流程
-                        ProcessDefinition p = actProcessService.getProcessDefinition(construction.getAct().getProcDefId());
+                        ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
                         String title = construction.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
                         actTaskService.startProcessNew(p.getKey(), "xm_construction_clarificaiton", construction.getId(), title, vars);
                     } else {
@@ -239,9 +242,10 @@ public class ConstructionController extends BaseController {
                         construction.setApplyName(projectManageRole);
                         construction.setProjectId(id);
                         construction.setProjectName(each.getRequireName());
+                        construction.setAcceptDate(new Date());
                         constructionService.newSave(construction);//保存
                         newProject.setStatus("1");
-                        newProject.setProjectId(id);
+                        newProject.setId(id);
                         projectService.updateStatus(newProject);
                         String procDefKey = construction.getAct().getProcDefKey();
                         // 启动流程

src/main/webapp/webpage/modules/sg/managementcenter/activiti/divideAudit.jsp

@@ -100,9 +100,10 @@
 					</div>
 					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
 						<form:hidden path="id"/>
+						<input type="text" value="${construction.id}">
 						<table class="table table-bordered">
 							<tbody>
-							<tr>
+<%--							<tr>
 								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>申请人：</label></td>
 								<td class="width-35">
 										${fns:unescapeHtml(construction.userName)}
@@ -112,7 +113,7 @@
 									<sys:userselect roleName="项目经理;施工单位" id="tuser" name="tuser.id" value="${construction.tuser.id}" labelName="tuser.name" labelValue="${construction.tuser.name}"
 													cssClass="form-control required"/>
 								</td>
-							</tr>
+							</tr>--%>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
 								<td class="width-35">
@@ -237,8 +238,6 @@
 						</table>
 					</form:form>
 
-
-					<c:if test="${construction.act.taskDefKey != '' && !construction.act.finishTask && construction.act.isNextGatewaty}">
 						<div class="row">
 							<div class="col-sm-3"></div>
 							<div class="col-sm-6">
@@ -248,17 +247,6 @@
 								</div>
 							</div>
 						</div>
-					</c:if>
-					<c:if test="${construction.act.taskDefKey != '' && !construction.act.finishTask && !construction.act.isNextGatewaty}">
-						<div class="row">
-							<div class="col-sm-3"></div>
-							<div class="col-sm-6">
-								<div class="form-group text-center">
-									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="办 理" />&nbsp;
-								</div>
-							</div>
-						</div>
-					</c:if>
 
 					<c:if test="${not empty construction.id}">
 						<act:flowChart procInsId="${construction.act.procInsId}"/>