浏览代码

发起流程

yue 5 年之前
父节点
当前提交
ea2f75e896

+ 2 - 1
src/main/java/com/jeeplus/modules/sg/financial/expense/mapper/ExpenseMapper.java

@@ -17,5 +17,6 @@ public interface ExpenseMapper extends BaseMapper<Expense> {
 
 
     void insertData(Expense expense);
     void insertData(Expense expense);
 
 
-    void
+    void updateData(Expense expense);
+
 }
 }

+ 9 - 0
src/main/java/com/jeeplus/modules/sg/financial/expense/service/ExpenseService.java

@@ -77,4 +77,13 @@ public class ExpenseService extends CrudService<ExpenseMapper, Expense> {
     public void deleteData(String id){
     public void deleteData(String id){
         expenseMapper.deleteData(id);
         expenseMapper.deleteData(id);
     }
     }
+
+    public void insertData(Expense expense) {
+        expenseMapper.insertData(expense);
+
+    }
+
+    public void updateData(Expense expense) {
+        expenseMapper.updateData(expense);
+    }
 }
 }

+ 1 - 1
src/main/java/com/jeeplus/modules/sg/financial/expense/web/ExpenseController.java

@@ -127,7 +127,7 @@ public class ExpenseController extends BaseController {
 	@RequestMapping(value = "update")
 	@RequestMapping(value = "update")
 	public AjaxJson update(Expense expense, Model model) throws Exception{
 	public AjaxJson update(Expense expense, Model model) throws Exception{
 		AjaxJson j = new AjaxJson();
 		AjaxJson j = new AjaxJson();
-		expenseService.(expense);//保存
+		expenseService.insertData(expense);//保存
 		j.setSuccess(true);
 		j.setSuccess(true);
 		j.setMsg("保存票务代理成功");
 		j.setMsg("保存票务代理成功");
 		return j;
 		return j;

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

@@ -353,7 +353,7 @@ public class PickIngController extends BaseController {
                 showList.setsVersion(value);
                 showList.setsVersion(value);
             }
             }
             //新增或编辑表单保存
             //新增或编辑表单保存
-//            showListService.save(showList);//保存
+            showListService.save(showList);//保存
             //查询项目的领料状态是否不为0
             //查询项目的领料状态是否不为0
             String acqStatus = showListService.findAcqStatus(showList);
             String acqStatus = showListService.findAcqStatus(showList);
             if ("0".equals(acqStatus)) {
             if ("0".equals(acqStatus)) {
@@ -361,11 +361,11 @@ public class PickIngController extends BaseController {
             }
             }
             //修改项目的状态
             //修改项目的状态
             // 启动流程
             // 启动流程
-/*            Map<String, Object> vars = Maps.newHashMap();
+            Map<String, Object> vars = Maps.newHashMap();
             vars.put("manager", UserUtils.getUser().getLoginName());
             vars.put("manager", UserUtils.getUser().getLoginName());
             ProcessDefinition p = actProcessService.getProcessDefinition(showList.getAct().getProcDefId());
             ProcessDefinition p = actProcessService.getProcessDefinition(showList.getAct().getProcDefId());
             String title = showList.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
             String title = showList.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
-            actTaskService.startProcess(p.getKey(), "md_acquisition_process", showList.getId(), title, vars);*/
+            actTaskService.startProcess(p.getKey(), "md_acquisition_process", showList.getId(), title, vars);
             j.setMsg("发起领料流程成功!");
             j.setMsg("发起领料流程成功!");
             j.getBody().put("targetUrl", "/act/task/process/");
             j.getBody().put("targetUrl", "/act/task/process/");