回滚问题修改

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

@@ -16,6 +16,8 @@ import com.jeeplus.modules.sg.managementcenter.activiti.service.DiscloseService;
 import com.jeeplus.modules.sg.managementcenter.activiti.service.ProcessPersonnelService;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 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.service.ShowListService;
 import org.activiti.bpmn.model.BpmnModel;
@@ -104,7 +106,8 @@ public class ActTaskService extends BaseService {
 	private ConstructionService constructionService;
 	@Autowired
 	private ShowListService showListService;
-
+	@Autowired
+	private MaterialModuleService materialModuleService;
 	@Autowired
 	private AdvanceService advanceService;
 	/**
@@ -2553,9 +2556,9 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(act.getFlag())? true : false);
-		Project user = MyActiviUtils.findUser(act.getProcInsId());
+		Project user = MyActiviUtils.findWZUser(act.getProcInsId());
 		vars.put("manager", UserUtils.getByUserName(user.getConstructionUnitLeader()).getLoginName());
-		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+//		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
 
@@ -2574,7 +2577,7 @@ public class ActTaskService extends BaseService {
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
 		vars.put("pass", "yes".equals(act.getFlag())? true : false);
-		vars.put("manager",wzUser.getConstructionUnitLeader());
+		vars.put("manager",UserUtils.getByUserName(wzUser.getConstructionUnitLeader()).getLoginName());
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}
 
@@ -3013,7 +3016,7 @@ public class ActTaskService extends BaseService {
 	}
 
 	/**
-	 * 配网项目经理判断是否完成非涉电工作
+	 * 配网项目经理判断是否完成土建工作
 	 * @param act
 	 */
 	@Transactional(readOnly = false)
@@ -3024,20 +3027,60 @@ public class ActTaskService extends BaseService {
 		act.preUpdate();
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = act.getTaskDefKey();
+		MaterialModule byProcInsId = materialModuleService.findByProcInsId(act.getProcInsId());
+		Integer nonPower = byProcInsId.getNonPower();
+		Integer electrical = byProcInsId.getElectrical();
+		Integer power = byProcInsId.getPower();
 		// 提交流程任务
 		Map<String, Object> vars = Maps.newHashMap();
+		if (nonPower==0&&electrical==0&&power==1) {
+			vars.put("contain",true);
+		} else if (nonPower==0&&electrical==0&&power==0) {
+			vars.put("contain", false);
+		}
 		//根据流程实例id查询项目的相关信息
 		Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
 		if ("yes".equals(flag)) {
 			//根据项目设置的流转人员，流转对应人员
-			vars.put("manager", user.getConstructionUnitManage());
-			vars.put("yes", true);
-			vars.put("no", false);
+			vars.put("manager", UserUtils.getByUserName(user.getConstructionUnitManage()).getLoginName());
 		} else {
 			//根据项目设置的流转人员，流转对应人员
-			vars.put("manager", user.getConstructionUnitManage());
-			vars.put("yes", false);
-			vars.put("no", true);
+			vars.put("manager", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
+		}
+		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
+	}
+
+	/**
+	 * 配网项目经理判断是否完成电气工作
+	 * @param act
+	 */
+	@Transactional(readOnly = false)
+	public void reviewElectrical(Act act) {
+		String flag = act.getFlag();
+		// 设置意见
+		act.setComment(("yes".equals(flag)?"[同意] ":"[驳回] ")+act.getComment());
+		act.preUpdate();
+		// 对不同环节的业务逻辑进行操作
+		String taskDefKey = act.getTaskDefKey();
+		MaterialModule byProcInsId = materialModuleService.findByProcInsId(act.getProcInsId());
+		Integer nonPower = byProcInsId.getNonPower();
+		Integer electrical = byProcInsId.getElectrical();
+		Integer power = byProcInsId.getPower();
+		// 提交流程任务
+		Map<String, Object> vars = Maps.newHashMap();
+		if (nonPower==0&&electrical==0&&power==1) {
+			vars.put("contain",true);
+		} else if (nonPower==0&&electrical==0&&power==0) {
+			vars.put("contain", false);
+		}
+		//根据流程实例id查询项目的相关信息
+		Project user = MyActiviUtils.sgFindUser(act.getProcInsId());
+		if ("yes".equals(flag)) {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("manager", UserUtils.getByUserName(user.getConstructionUnitManage()).getLoginName());
+		} else {
+			//根据项目设置的流转人员，流转对应人员
+			vars.put("manager", UserUtils.getByUserName(user.getProjectManageRole()).getLoginName());
 		}
 		complete(act.getTaskId(), act.getProcInsId(), act.getComment(), vars);
 	}

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -1297,6 +1297,7 @@ public class ActTaskController extends BaseController {
 				a.setProcInsId(act.getProcInsId());
 			}
 			pickIngService.processList(showLists);
+			pickIngService.processTemList(showLists);
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
 			actTaskService.pickIng(act);
@@ -1333,6 +1334,17 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 
+
+	@ResponseBody
+	@RequestMapping(value = "managerExam")
+	public AjaxJson managerExam(Act act) {
+		AjaxJson j = new AjaxJson();
+
+		actTaskService.managerExam(act);
+		j.setMsg("审批成功");
+		return j;
+	}
+
 	/**
 	 * 项目中心领导审核领料单
 	 * @param act
@@ -1603,7 +1615,28 @@ public class ActTaskController extends BaseController {
 		return j;
 	}
 
+	/**
+	 * 审核电气施工中流程
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "reElectricalMiddleTask")
+	public AjaxJson reElectricalMiddleTask(Act act) {
+		AjaxJson j = new AjaxJson();
+		String comment = null;
+		try {
+			comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			actTaskService.reElectricalMiddleTask(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
 
+	/**
+	 * 审核电气竣工流程
+	 * */
 	@ResponseBody
 	@RequestMapping(value = "reElectricalEndTask")
 	public AjaxJson reElectricalEndTask(Act act) {
@@ -1655,10 +1688,8 @@ public class ActTaskController extends BaseController {
 		try {
 			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
 			act.setComment(comment);
-			MaterialModule materialModule = materialModuleService.get(act.getProcInsId());
 			//设置土建完成
-			materialModule.setNonPower(0);
-
+			materialModuleService.updateNonPower(act.getProcInsId());
 			actTaskService.reviewNonPower(act);
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
@@ -1668,6 +1699,26 @@ public class ActTaskController extends BaseController {
 	}
 
 	/**
+	 * 配网项目经理判断是否完成电气
+	 * */
+	@ResponseBody
+	@RequestMapping(value = "reviewElectrical")
+	public AjaxJson reviewElectrical(Act act) {
+		AjaxJson j = new AjaxJson();
+		try {
+			String comment = URLDecoder.decode(act.getComment(), "UTF-8");
+			act.setComment(comment);
+			//设置土建完成
+			materialModuleService.updateElectrical(act.getProcInsId());
+			actTaskService.reviewElectrical(act);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		j.setMsg("审批成功");
+		return j;
+	}
+
+	/**
 	 * 施工单位项目经理判断是否包含涉电工作
 	 * */
 	@ResponseBody

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/mapper/MaterialModuleMapper.java

@@ -53,4 +53,11 @@ public interface MaterialModuleMapper extends BaseMapper<MaterialModule> {
     //根据流程实列id修改项目记录领料次数信息
     void updateModuleById(MaterialModule module);
 
+    void updateNonPower(String procInsId);
+
+    void updateElectrical(String procInsId);
+
+    void updatePower(String procInsId);
+
+    MaterialModule findByProcInsId(String procInsId);
 }

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/mapper/xml/MaterialModuleMapper.xml

@@ -1,8 +1,8 @@
 <?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.sg.materialmodule.activiti.mapper.MaterialModuleMapper">
-    
-	<sql id="materialColumns">
+
+    <sql id="materialColumns">
 		a.id AS "id",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
@@ -16,34 +16,34 @@
 		a.project_name AS "projectName",
 		a.project_type AS "projectType"
 	</sql>
-    
-	<select id="get" resultType="MaterialModule" >
-		SELECT 
-			<include refid="materialColumns"/>
-		FROM sg_construction_process a
-		WHERE a.proc_ins_id = #{procInsId}
-	</select>
-	
-	<select id="findList" resultType="MaterialModule" >
-		SELECT
-		<include refid="materialColumns"/>
-		FROM sg_construction_process a
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-				ORDER BY a.update_date DESC
-			</otherwise>
-		</choose>
-	</select>
 
-<!--	修改提前施工状态0未提前施工，1提前施工
-	<update id="updatePreConstruction">
-		update xm_project_details set preConstruction = #{preConstruction} where id = #{id};
-	</update>-->
+    <select id="get" resultType="MaterialModule">
+        SELECT
+        <include refid="materialColumns"/>
+        FROM sg_construction_process a
+        WHERE a.proc_ins_id = #{procInsId}
+    </select>
+
+    <select id="findList" resultType="MaterialModule">
+        SELECT
+        <include refid="materialColumns"/>
+        FROM sg_construction_process a
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+            <otherwise>
+                ORDER BY a.update_date DESC
+            </otherwise>
+        </choose>
+    </select>
 
-	<insert id="insert">
+    <!--	修改提前施工状态0未提前施工，1提前施工
+        <update id="updatePreConstruction">
+            update xm_project_details set preConstruction = #{preConstruction} where id = #{id};
+        </update>-->
+
+    <insert id="insert">
 		insert into sg_construction_process (
 			id,
 			create_by,
@@ -82,29 +82,30 @@
 			)
 	</insert>
 
-	<update id="updateConstructionStatus">
+    <update id="updateConstructionStatus">
 		update xm_project_details set construction_status = '1' where id=#{projectId}
 	</update>
 
-	<select id="findProjectName" resultType="string">
+    <select id="findProjectName" resultType="string">
 		select project_name from sg_construction_process where proc_ins_id = #{procInsId};
 	</select>
 
-	<select id="findSpecificTime" resultType="java.util.Date">
+    <select id="findSpecificTime" resultType="java.util.Date">
 		select specificTime from ms_construction_project where projectName = #{projectName};
 	</select>
 
-	<select id="findUserId" parameterType="java.util.List" resultType="java.lang.String">
-		 select id from sys_user
-		 where name in
-		 (
-			<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-		 )
-	</select>
+    <select id="findUserId" parameterType="java.util.List" resultType="java.lang.String">
+        select id from sys_user
+        where name in
+        (
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        )
+    </select>
 
-	<select id="findProject" resultType="com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject">
+    <select id="findProject"
+            resultType="com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject">
 		select id
 		, create_by
 		, create_date
@@ -138,7 +139,7 @@
 		where projectName = #{projectName}
 	</select>
 
-	<insert id="conProject">
+    <insert id="conProject">
 		  INSERT INTO ms_construction_project(
 			id,
 			create_by,
@@ -205,28 +206,46 @@
 		)
 	</insert>
 
-	<select id="findMonthProject" resultType="com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject">
+    <select id="findMonthProject"
+            resultType="com.jeeplus.modules.sg.managementcenter.constructionProject.entity.ConstructionProject">
 		select projectName,endFlag from ms_construction_project where DATE_FORMAT( arrangeTime, '%Y%m' ) = DATE_FORMAT( CURDATE() , '%Y%m' )
 	</select>
 
-	<select id="findMaterialProject" resultType="com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule">
-		select id,proc_ins_id, user_name, project_id, project_name, project_type from sg_construction_process where project_name
-		(
-			<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
-				#{item.projectName}
-			</foreach>
-		)
-	</select>
+    <select id="findMaterialProject" resultType="com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule">
+        select id,proc_ins_id, user_name, project_id, project_name, project_type from sg_construction_process where
+        project_name
+        (
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.projectName}
+        </foreach>
+        )
+    </select>
 
-	<update id="updateEndFlag">
+    <update id="updateEndFlag">
 		update ms_construction_project set endFlag = 1 where projectName = #{projectName};
 	</update>
 
-	<select id="getModuleById" resultType="com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule">
+    <select id="getModuleById" resultType="com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule">
 		select project_name,proc_ins_id,now_project_name,frequency from sg_construction_process where proc_ins_id = #{procInsId};
 	</select>
 
-	<update id="updateModuleById">
+    <update id="updateModuleById">
 		update sg_construction_process set frequency = #{frequency},now_project_name=#{nowProjectName} where proc_ins_id = #{procInsId};
 	</update>
+
+    <update id="updateNonPower">
+		update sg_construction_process set nonPower = 0 where proc_ins_id  = #{procInsId}
+	</update>
+
+    <update id="updateElectrical">
+		update sg_construction_process set electrical = 0 where proc_ins_id  = #{procInsId}
+	</update>
+
+    <update id="updatePower">
+		update sg_construction_process set power = 0 where proc_ins_id  = #{procInsId}
+	</update>
+	
+	<select id="findByProcInsId" resultType="com.jeeplus.modules.sg.materialmodule.activiti.entity.MaterialModule">
+		select project_name,proc_ins_id,nonPower,electrical,power from sg_construction_process where proc_ins_id  = #{procInsId};
+	</select>
 </mapper>

src/main/java/com/jeeplus/modules/sg/materialmodule/activiti/service/MaterialModuleService.java

@@ -19,6 +19,7 @@ import java.util.List;
 
 /**
  * 请假表单Service
+ *
  * @author lgf
  * @version 2018-06-12
  */
@@ -26,70 +27,89 @@ import java.util.List;
 @Transactional(readOnly = true)
 public class MaterialModuleService extends CrudService<MaterialModuleMapper, MaterialModule> {
     @Autowired
-	private MaterialModuleMapper materialModuleMapper;
-
-	public MaterialModule get(String id) {
-		MaterialModule materialModule = super.get(id);
-		return materialModule;
-	}
-
-	//查询项目信息
-	public String findProjectName (String procInsId){
-		return materialModuleMapper.findProjectName(procInsId);
-	}
-
-	//根据项目名称查询，项目计划开工时间
-	public Date findSpecificTime(String projectName){
-		return materialModuleMapper.findSpecificTime(projectName);
-	}
-
-	//根据角色名查找用户id
-	public List<String> findUserId(List<String> list){
-		return materialModuleMapper.findUserId(list);
-	}
-
-	//根据项目名称获取项目计划数据
-	public ConstructionProject findProject(String projectName){
-		return materialModuleMapper.findProject(projectName);
-	}
-
-	//插入对应的计划信息
-	@Transactional(readOnly = false)
-	public void conProject(ConstructionProject constructionProject){
-		materialModuleMapper.conProject(constructionProject);
-	}
-
-	//查询当月所有的计划项目信息
-	public List<ConstructionProject> findMonthProject(){
-		return materialModuleMapper.findMonthProject();
-	}
-
-	//根据list<项目名>查询所有的流程项目信息
-	public List<MaterialModule> findMaterialProject(List<ConstructionProject> list){
-		return materialModuleMapper.findMaterialProject(list);
-	}
-
-	//修改计划项目的是否竣工状态
-	@Transactional(readOnly = false)
-	public void updateEndFlag(String projectName){
-		materialModuleMapper.updateEndFlag(projectName);
-	}
-
-	//根据流程是列id获取流程信息
-	public MaterialModule getModuleById(String procInsId){
-		return materialModuleMapper.getModuleById(procInsId);
-	}
-
-	//根据流程实列id修改项目记录领料次数信息
-	@Transactional(readOnly = false)
-	public void updateModuleById(MaterialModule module){
-		materialModuleMapper.updateModuleById(module);
-	}
-
-	@Transactional(readOnly = false)
-	@Override
-	public void save(MaterialModule entity) {
-		materialModuleMapper.updateConstructionStatus(entity);
-		super.save(entity);
-	}
+    private MaterialModuleMapper materialModuleMapper;
+
+    public MaterialModule get(String id) {
+        MaterialModule materialModule = super.get(id);
+        return materialModule;
+    }
+
+    //查询项目信息
+    public String findProjectName(String procInsId) {
+        return materialModuleMapper.findProjectName(procInsId);
+    }
+
+    //根据项目名称查询，项目计划开工时间
+    public Date findSpecificTime(String projectName) {
+        return materialModuleMapper.findSpecificTime(projectName);
+    }
+
+    //根据角色名查找用户id
+    public List<String> findUserId(List<String> list) {
+        return materialModuleMapper.findUserId(list);
+    }
+
+    //根据项目名称获取项目计划数据
+    public ConstructionProject findProject(String projectName) {
+        return materialModuleMapper.findProject(projectName);
+    }
+
+    //插入对应的计划信息
+    @Transactional(readOnly = false)
+    public void conProject(ConstructionProject constructionProject) {
+        materialModuleMapper.conProject(constructionProject);
+    }
+
+    //查询当月所有的计划项目信息
+    public List<ConstructionProject> findMonthProject() {
+        return materialModuleMapper.findMonthProject();
+    }
+
+    //根据list<项目名>查询所有的流程项目信息
+    public List<MaterialModule> findMaterialProject(List<ConstructionProject> list) {
+        return materialModuleMapper.findMaterialProject(list);
+    }
+
+    //修改计划项目的是否竣工状态
+    @Transactional(readOnly = false)
+    public void updateEndFlag(String projectName) {
+        materialModuleMapper.updateEndFlag(projectName);
+    }
+
+    //根据流程是列id获取流程信息
+    public MaterialModule getModuleById(String procInsId) {
+        return materialModuleMapper.getModuleById(procInsId);
+    }
+
+    //根据流程实列id修改项目记录领料次数信息
+    @Transactional(readOnly = false)
+    public void updateModuleById(MaterialModule module) {
+        materialModuleMapper.updateModuleById(module);
+    }
+
+    @Transactional(readOnly = false)
+    @Override
+    public void save(MaterialModule entity) {
+        materialModuleMapper.updateConstructionStatus(entity);
+        super.save(entity);
+    }
+
+    @Transactional(readOnly = false)
+    public void updateNonPower(String procInsId) {
+		materialModuleMapper.updateNonPower(procInsId);
+    }
+
+    @Transactional(readOnly = false)
+    public void updateElectrical(String procInsId) {
+		materialModuleMapper.updateElectrical(procInsId);
+    }
+
+    @Transactional(readOnly = false)
+    public void updatePower(String procInsId) {
+		materialModuleMapper.updatePower(procInsId);
+    }
+
+    public MaterialModule findByProcInsId(String procInsId) {
+        return materialModuleMapper.findByProcInsId(procInsId);
+    }
 }

src/main/java/com/jeeplus/modules/sg/picking/activiti/mapper/xml/ShowListMapper.xml

@@ -167,6 +167,23 @@
 	from md_process_list where procInsId = #{procInsId}
 	</select>
 
+	<select id="findNewTemList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
+	SELECT
+		id,
+		procInsId,
+		materialCode,
+		extensionDescription,
+		materialDescription,
+		mdUnits,
+		mdTotalAmount,
+		mdTotalAmountAfter,
+		mdSingleWeight,
+		mdTotalWeight,
+		mdTheParty,
+		mdText
+	from md_temporary_list where procInsId = #{procInsId}
+	</select>
+
 	<select id="inventoryComparisonData" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
 	SELECT
 		id,
@@ -216,6 +233,34 @@
 		where id = #{id};
 	</update>
 
+	<select id="findOneTemList" resultType="com.jeeplus.modules.sg.picking.activiti.entity.ShowList">
+	SELECT
+		id,
+		procInsId,
+		materialCode,
+		extensionDescription,
+		materialDescription,
+		mdUnits,
+		mdTotalAmount,
+		mdSingleWeight,
+		mdTotalWeight,
+		mdTheParty,
+		mdText
+	from md_temporary_list where id = #{id}
+	</select>
+
+	<update id="updateTemAmount">
+		update md_temporary_list
+		set mdTotalAmount = #{mdTotalAmount},
+			mdTotalWeight=#{mdTotalWeight}
+		where id = #{id};
+	</update>
+
+	<delete id="deleteTemData">
+		delete from md_temporary_list where id=#{id};
+	</delete>
+
+
 	<delete id="deleteData">
 		delete from md_process_list where id=#{id};
 	</delete>

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/PickIngController.java

@@ -520,6 +520,7 @@ public class PickIngController extends BaseController {
         double v = b1.multiply(b2).doubleValue();
         showList.setMdTotalWeight(v);
         showListService.updateTemAmount(showList);
+        showListService.updateAmount(showList);
         j.setMsg("成功");
         return j;
     }
@@ -561,6 +562,7 @@ public class PickIngController extends BaseController {
         String idArray[] = ids.split(",");
         for (String id : idArray) {
             showListService.deleteTemData(id);
+            showListService.deleteData(id);
         }
         j.setMsg("删除成功！");
         return j;
@@ -647,8 +649,9 @@ public class PickIngController extends BaseController {
             //备注
             showList.setMdText("");
 
-            List<ShowList> insertList = new ArrayList<>();
+            List<ShowList> insertList =  new ArrayList<>();
             insertList.add(showList);
+            pickIngService.processList(insertList);
             //将信息和数量存入对应表
             pickIngService.processTemList(insertList);
             j.setMsg("添加成功！");
@@ -702,6 +705,14 @@ public class PickIngController extends BaseController {
             } catch (IOException e) {
                 e.printStackTrace();
             }
+        } else {
+            try {
+                String fileName = "没有对应的项目信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+                List<CapitalExport> nullExports = new ArrayList<>();
+                new ExportExcel("没有对应的项目信息", CapitalExport.class).setDataList(nullExports).write(response,fileName ).dispose();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
         //需改导出状态及导出时间
         return j;
@@ -751,6 +762,14 @@ public class PickIngController extends BaseController {
             } catch (IOException e) {
                 e.printStackTrace();
             }
+        }else {
+            try {
+                String fileName = "没有对应的项目信息" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
+                List<CapitalExport> nullExports = new ArrayList<>();
+                new ExportExcel("没有对应的项目信息", CapitalExport.class).setDataList(nullExports).write(response,fileName ).dispose();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
         //需改导出状态及导出时间
         return j;

src/main/webapp/webpage/modules/sg/materialmodule/activiti/reviewElectrical.js

@@ -139,7 +139,7 @@ $(document).ready(function() {
 
 		$("#agree").click(function () {
 			jp.prompt("审核意见", function (message) {
-				jp.post("${ctx}/act/task/reviewNonPower",
+				jp.post("${ctx}/act/task/reviewElectrical",
 					{
 						"taskId":"${materialModule.act.taskId}",
 						"taskName":"${materialModule.act.taskName}",
@@ -160,7 +160,7 @@ $(document).ready(function() {
 
 	$("#no").click(function () {
 		jp.prompt("审核意见", function (message) {
-			jp.post("${ctx}/act/task/reviewNonPower",
+			jp.post("${ctx}/act/task/reviewElectrical",
 				{
 					"taskId":"${materialModule.act.taskId}",
 					"taskName":"${materialModule.act.taskName}",

src/main/webapp/webpage/modules/sg/materialmodule/activiti/reviewElectrical.jsp

@@ -7,7 +7,7 @@
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
-	<%@include file="reviewNonPower.js"%>
+	<%@include file="reviewElectrical.js"%>
 </head>
 <body>
 	<div class="wrapper wrapper-content">
@@ -40,8 +40,8 @@
 				<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;
-						<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="未完成非涉电工作" />&nbsp;
+						<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="完成电气工作" />&nbsp;
+						<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="未完成电气工作" />&nbsp;
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/sg/materialmodule/activiti/reviewNonPower.js

@@ -115,7 +115,7 @@ $(document).ready(function() {
 	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
 		  $('#testPicTable').bootstrapTable("toggleView");
 		}
-	  
+
 	  $('#testPicTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
                 'check-all.bs.table uncheck-all.bs.table', function () {
             $('#remove').prop('disabled', ! $('#testPicTable').bootstrapTable('getSelections').length);

src/main/webapp/webpage/modules/sg/materialmodule/activiti/reviewNonPower.jsp

@@ -40,8 +40,8 @@
 				<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;
-						<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="未完成非涉电工作" />&nbsp;
+						<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="完成土建工作" />&nbsp;
+						<input id="no" class="btn  btn-primary btn-lg btn-danger" type="submit" value="未完成土建工作" />&nbsp;
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/sg/picking/activiti/managerExam.jsp

@@ -28,7 +28,7 @@
 	</div>
 		<form:form id="inputForm" modelAttribute="act" class="form-horizontal">
 			<input type="hidden" id="procInsId" name="procInsId" value="${act.procInsId}"/>
-			<input type="text" id="procInsId" name="procInsId" value="${act.taskId}"/>
+			<input type="hidden" id="taskId" name="procInsId" value="${act.taskId}"/>
 		</form:form>
 		<div id="">
 			<button id="exportBlock" class="btn btn-info">