Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -1325,7 +1325,8 @@ public class ActTaskService extends BaseService {
 		Map<String, Object> vars = Maps.newHashMap();
 		String flag = act.getFlag();
 		if ("yes".equals(flag)) {
-
+			vars.put("status", 1);
+			vars.put("procInsId", act.getProcInsId());
 		} else {
 			ProcessPersonnel loginName = processPersonnelService.findLoginName(act.getProcInsId());
 			design = loginName.getOperatingPersonnel();

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/UploadImages.java

@@ -7,6 +7,15 @@ public class UploadImages extends ActEntity<UploadImages> {
     private String path;
     private String procInsId;
     private String uId;
+    private String projectName;
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
 
     public String getImgName() {
         return imgName;

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

@@ -24,9 +24,10 @@
 	</select>
 	
 	<select id="findList" resultType="UploadImages" >
-		SELECT *
-		FROM xm_upolad_images a
+		SELECT a.*,b.project_name as projectName
+		FROM xm_upolad_images a,xm_construction_clarificaiton b
 		<where>
+			a.proc_ins_id=b.proc_ins_id
 			<if test="dataScope != null and dataScope != ''">
 				${dataScope}
 			</if>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/EndTaskListen.java

@@ -0,0 +1,28 @@
+package com.jeeplus.modules.sg.managementcenter.activiti.utils;
+
+import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.ExecutionListener;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.beans.Expression;
+import java.io.Serializable;
+
+public class EndTaskListen implements Serializable, ExecutionListener {
+    /**
+     * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+     */
+    private static final long serialVersionUID = 8513750196548027535L;
+
+    @Autowired
+    private ProjectService projectService;
+
+    @Override
+    public void notify(DelegateExecution delegateExecution) throws Exception {
+        System.out.println("status");
+        System.out.println("procinsId");
+        String processInstanceId = delegateExecution.getProcessInstanceId();
+        System.out.println(processInstanceId);
+        projectService.updateStatusBy("2", processInstanceId);
+    }
+}

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

@@ -331,6 +331,10 @@ public class ConstructionController extends BaseController {
         return "modules/sg/managementcenter/activiti/documentsForm";
     }
 
+    public void updateStatus(String status, String id) {
+
+    }
+
     /**
      * 保存请假申请
      */

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/ProjectMapper.java

@@ -19,5 +19,10 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     public void updateStatus(Project project);
 
+    /**
+     * 根据项目需求名称修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底
+     * */
+    void updateStatusBy(String status,String procInsId);
+
     public List<Project> findListById(String[] proListId);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/xml/ProjectMapper.xml

@@ -253,6 +253,12 @@
 		select * FROM xm_project_details  where ${id} = '${value}'
 	</select>
 
+	<!--根据项目名称修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底-->
+	<update id="updateStatusBy">
+		update xm_project_details set status = #{status} where require_name = (select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId});
+	</update>
+
+	<!--修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底-->
 	<update id="updateStatus">
 		update xm_project_details set status = #{status} where id = #{id};
 	</update>
@@ -268,4 +274,5 @@
 		</foreach>
 	</select>
 
+
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/project/service/ProjectService.java

@@ -56,4 +56,12 @@ public class ProjectService extends CrudService<ProjectMapper, Project> {
 		return projectMapper.findListById(proListId);
 	}
 
+	/**
+	 * 根据项目需求名称修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底
+	 */
+	public void updateStatusBy(String status, String procInsId) {
+		projectMapper.updateStatusBy(status,procInsId);
+	}
+
+
 }

src/main/webapp/webpage/modules/sg/managementcenter/activiti/uploadList.js

@@ -133,7 +133,13 @@ $(document).ready(function() {
 					   title: '流程id',
 					   sortable: true,
 					   sortName: 'procInsId',
-				   }]
+				   },{
+					   field: 'projectName',
+					   title: '项目名称',
+					   sortable: true,
+					   sortName: 'procInsId',
+				   }
+				   ]
 		});
 		
 		  

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

@@ -21,8 +21,8 @@
 	<div id="search-collapse" class="collapse">
 		<div class="accordion-inner">
 	<form:form id="searchForm" modelAttribute="uploadImages" class="form form-horizontal well clearfix">
-		<input type="text" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
-		<input type="text" id="path" name="path" value="${uploadImages.path}">
+		<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
+		<input type="hidden" id="path" name="path" value="${uploadImages.path}">
 		 <div class="col-xs-12 col-sm-6 col-md-4">
 			<div style="margin-top:26px">
 			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>