浏览代码

施工验收流程涉电部分

yue 5 年之前
父节点
当前提交
8704407c5f

+ 7 - 0
src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -19,6 +19,8 @@ import com.jeeplus.modules.sg.managementcenter.project.entity.Project;
 import com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule;
 import com.jeeplus.modules.sg.materialmodule.activiti.service.MaterialModuleService;
 import com.jeeplus.modules.sg.picking.activiti.entity.PickApplication;
+import com.jeeplus.modules.sg.picking.activiti.entity.ShowList;
+import com.jeeplus.modules.sg.picking.activiti.service.PickIngService;
 import com.jeeplus.modules.sg.picking.activiti.service.ShowListService;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.engine.FormService;
@@ -2573,6 +2575,11 @@ public class ActTaskService extends BaseService {
 		act.preUpdate();
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = act.getTaskDefKey();
+		ShowList showList = new ShowList();
+		showList.setAct(act);
+		List<ShowList> newTemList = showListService.findNewTemList(showList);
+		PickIngService pickIngService = new PickIngService();
+		pickIngService.processList(newTemList);
 		Project wzUser = MyActiviUtils.findWZUser(act.getProcInsId());
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();

+ 4 - 0
src/main/java/com/jeeplus/modules/sg/picking/activiti/service/ShowListService.java

@@ -48,6 +48,10 @@ public class ShowListService extends CrudService<ShowListMapper, ShowList> {
 		return page;
 	}
 
+	public List<ShowList> findNewTemList(ShowList showList) {
+		return mapper.findNewTemList(showList);
+	}
+
 
 	public Page<Acquisition> acquisitionList(Page<Acquisition> page, Acquisition acquisition) {
 		dataRuleFilter(acquisition);