Merge remote-tracking branch 'origin/master'

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

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

@@ -24,7 +24,9 @@ import com.jeeplus.core.persistence.ActEntity;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.utils.ProcessDefCache;
 import com.jeeplus.modules.sg.managementcenter.activiti.entity.PersonnelManagement;
+import com.jeeplus.modules.sg.managementcenter.activiti.service.ConstructionService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.PersonnelManagementService;
+import com.jeeplus.modules.sg.managementcenter.project.service.ProjectService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.bpmn.converter.BpmnXMLConverter;
 import org.activiti.bpmn.model.BpmnModel;
@@ -72,6 +74,10 @@ public class ActProcessService extends BaseService {
 	private ActTaskService actTaskService;
 	@Autowired
 	private PersonnelManagementService personnelManagementService;
+	@Autowired
+	private ConstructionService constructionService;
+	@Autowired
+	private ProjectService projectService;
 
 	/**
 	 * 流程定义列表
@@ -411,6 +417,13 @@ public class ActProcessService extends BaseService {
 	 */
 	@Transactional(readOnly = false)
 	public void deleteProcIns(String procInsId, String deleteReason) {
+		//根据流程实例ID查询项目需求名称（如果不为空）
+		String s = constructionService.idProjectName(procInsId);
+		if (s != null && s != "") {
+			String status = "0";
+			projectService.updateStatusBy(status, procInsId);
+		}
+		//更具需求名称修改项目施工交底状态，为0
 		runtimeService.deleteProcessInstance(procInsId, deleteReason);
 	}
 

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

@@ -34,5 +34,7 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
     //根据流程id查询项目的需求提出单位
     String demandUnit(String procInsId);
 
+    //根据流程定义号查询项目需求名称
+    String idProjectName(String procInsId);
 
 }

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

@@ -269,4 +269,8 @@
 	<select id="demandUnit" resultType="string">
 		select demand_unit from xm_project_details where require_name = (select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId});
 	</select>
+	<!--根据流程定义号查询项目需求名称-->
+	<select id="idProjectName" resultType="string">
+		select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId};
+	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/ConstructionService.java

@@ -82,4 +82,9 @@ public class ConstructionService extends CrudService<ConstructionMapper, Constru
 		return constructionMapper.demandUnit(procInsId);
 	}
 
+	//根据流程定义号查询项目需求名称
+	public String idProjectName(String procInsId) {
+		return constructionMapper.idProjectName(procInsId);
+	}
+
 }

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

@@ -6,7 +6,6 @@ package com.jeeplus.modules.sg.managementcenter.project.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,7 +22,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
     /**
      * 根据项目需求名称修改项目施工交底状态0未发起施工交底，1施工交底过程中，2完成施工交底
      * */
-    void updateStatusBy(@Param("status") String status,@Param("procInsId") String procInsId);
+    void updateStatusBy(String status,String procInsId);
 
     public List<Project> findListById(String[] proListId);
 }