|
@@ -10,7 +10,7 @@ import com.zjugis.framework.workflow.exception.BusinessException;
|
|
import com.zjugis.framework.workflow.model.BaseController;
|
|
import com.zjugis.framework.workflow.model.BaseController;
|
|
import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
|
|
import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
|
|
import com.zjugis.framework.workflow.spring.resovler.ParamModel;
|
|
import com.zjugis.framework.workflow.spring.resovler.ParamModel;
|
|
-import com.zjugis.module.adm.api.staff.StaffApi;
|
|
|
|
|
|
+//import com.zjugis.module.adm.api.staff.StaffApi;
|
|
import com.zjugis.module.adm.api.staff.dto.StaffRecordsDTO;
|
|
import com.zjugis.module.adm.api.staff.dto.StaffRecordsDTO;
|
|
import com.zjugis.module.system.api.dept.DeptApi;
|
|
import com.zjugis.module.system.api.dept.DeptApi;
|
|
import com.zjugis.module.system.api.user.AdminUserApi;
|
|
import com.zjugis.module.system.api.user.AdminUserApi;
|
|
@@ -41,8 +41,8 @@ public class StaffEvent extends BaseController {
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
private StaffService staffService;
|
|
private StaffService staffService;
|
|
- @Resource
|
|
|
|
- private StaffApi staffApi;
|
|
|
|
|
|
+// @Resource
|
|
|
|
+// private StaffApi staffApi;
|
|
@Autowired
|
|
@Autowired
|
|
WorkflowClient workflowClient;
|
|
WorkflowClient workflowClient;
|
|
|
|
|
|
@@ -99,7 +99,8 @@ public class StaffEvent extends BaseController {
|
|
staffService.updateStaff(entity);
|
|
staffService.updateStaff(entity);
|
|
StaffRecordsDTO dto = StaffConvert.INSTANCE.convert(entity);
|
|
StaffRecordsDTO dto = StaffConvert.INSTANCE.convert(entity);
|
|
//数据归档
|
|
//数据归档
|
|
- return ok(staffApi.insertStaff(dto));
|
|
|
|
|
|
+// staffApi.insertStaff(dto);
|
|
|
|
+ return ok("true");
|
|
} else {
|
|
} else {
|
|
throw new BusinessException("执行事件出错,请联系管理员!");
|
|
throw new BusinessException("执行事件出错,请联系管理员!");
|
|
}
|
|
}
|
|
@@ -190,11 +191,11 @@ public class StaffEvent extends BaseController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- /**
|
|
|
|
- * 生成最新工号
|
|
|
|
- */
|
|
|
|
- @GetMapping("/generateNum")
|
|
|
|
- public CommonResult<String> generateNum() {
|
|
|
|
- return staffApi.generateNum();
|
|
|
|
- }
|
|
|
|
|
|
+// /**
|
|
|
|
+// * 生成最新工号
|
|
|
|
+// */
|
|
|
|
+// @GetMapping("/generateNum")
|
|
|
|
+// public CommonResult<String> generateNum() {
|
|
|
|
+// return staffApi.generateNum();
|
|
|
|
+// }
|
|
}
|
|
}
|