|
@@ -11,7 +11,6 @@ import com.jeeplus.modules.cg.reservemanagementcenter.reserveManage.mapper.Reser
|
|
import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
|
|
import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
|
|
import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
|
|
import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
|
|
import com.jeeplus.modules.sg.managementcenter.materialinfo.util.MaterialInfoUtil;
|
|
import com.jeeplus.modules.sg.managementcenter.materialinfo.util.MaterialInfoUtil;
|
|
-import com.jeeplus.modules.sys.utils.UserUtils;
|
|
|
|
import org.activiti.engine.TaskService;
|
|
import org.activiti.engine.TaskService;
|
|
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
|
|
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
|
|
import org.apache.poi.ss.usermodel.Row;
|
|
import org.apache.poi.ss.usermodel.Row;
|
|
@@ -314,7 +313,9 @@ public class ReserveSummaryProcessService extends CrudService<ReserveSummaryProc
|
|
budgetBookService.save(budgetBook);
|
|
budgetBookService.save(budgetBook);
|
|
} else if ("no".equals(flag)){
|
|
} else if ("no".equals(flag)){
|
|
//不通过-回到上一个流程
|
|
//不通过-回到上一个流程
|
|
- vars.put("manager", UserUtils.getByUserName(user.getDesigner()).getLoginName());
|
|
|
|
|
|
+ //根据用户名去数据库中查找登录名
|
|
|
|
+ String loginNameByName = mapper.getLoginNameByName(user.getDesigner());
|
|
|
|
+ vars.put("manager", loginNameByName);
|
|
vars.put("pass",false);
|
|
vars.put("pass",false);
|
|
//根据项目储备编号修改 是否完成概算修改状态
|
|
//根据项目储备编号修改 是否完成概算修改状态
|
|
projectReserveId = reserveProcess.getProjectReserveId();
|
|
projectReserveId = reserveProcess.getProjectReserveId();
|