企业编号 最大值 加1 以及新增时，企标名称可以重复（编号和名称重复也是新增一条，不做覆盖）
This commit is contained in:
gaojiabao
+158
-160
@@ -101,12 +101,12 @@ public class WorkFlowController {
|
||||
InputStream inputStream = null;
|
||||
HttpURLConnection conn = null;
|
||||
response.reset();
|
||||
File file = new File(downloadUrl+modelHisOne.getEditFilePath());
|
||||
File file = new File(downloadUrl + modelHisOne.getEditFilePath());
|
||||
|
||||
if(file.exists()){
|
||||
if (file.exists()) {
|
||||
try {
|
||||
String fileOldName = fileNameEncoding(oldFileName,request);
|
||||
response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\"");
|
||||
String fileOldName = fileNameEncoding(oldFileName, request);
|
||||
response.setHeader("Content-Disposition", "attachment;filename=\"" + fileOldName + "\"");
|
||||
response.setContentType("application/octet-stream");
|
||||
inputStream = new FileInputStream(file);
|
||||
os = response.getOutputStream();
|
||||
@@ -118,13 +118,13 @@ public class WorkFlowController {
|
||||
org.apache.commons.io.IOUtils.closeQuietly(inputStream);
|
||||
org.apache.commons.io.IOUtils.closeQuietly(os);
|
||||
}
|
||||
}else {
|
||||
} else {
|
||||
URL url;
|
||||
try {
|
||||
String fileOldName = fileNameEncoding(oldFileName,request);
|
||||
response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\"");
|
||||
String fileOldName = fileNameEncoding(oldFileName, request);
|
||||
response.setHeader("Content-Disposition", "attachment;filename=\"" + fileOldName + "\"");
|
||||
response.setContentType("application/octet-stream");
|
||||
url = new URL(downloadUrl+modelHisOne.getEditFilePath());
|
||||
url = new URL(downloadUrl + modelHisOne.getEditFilePath());
|
||||
conn = (HttpURLConnection) url.openConnection();
|
||||
// 设置超时间为5秒
|
||||
conn.setConnectTimeout(3 * 1000);
|
||||
@@ -153,13 +153,13 @@ public class WorkFlowController {
|
||||
}
|
||||
|
||||
/**
|
||||
* @return java.lang.String
|
||||
* @Author super_liu
|
||||
* @Description 根据不同浏览器定义下载文件编码
|
||||
* Date 2018/10/11 10:40
|
||||
* @Param [fileName, request]
|
||||
* @return java.lang.String
|
||||
**/
|
||||
public String fileNameEncoding(String fileName, HttpServletRequest request) throws IOException {
|
||||
public String fileNameEncoding(String fileName, HttpServletRequest request) throws IOException {
|
||||
String agent = request.getHeader("User-Agent");
|
||||
if (agent.contains("Firefox")) {
|
||||
/*BASE64Encoder base64Encoder = new BASE64Encoder();
|
||||
@@ -169,21 +169,21 @@ public class WorkFlowController {
|
||||
} else {
|
||||
fileName = URLEncoder.encode(fileName, "utf-8");
|
||||
//谷歌中空格变为+问题
|
||||
fileName = fileName.replaceAll("\\+","%20");
|
||||
fileName = fileName.replaceAll("\\+", "%20");
|
||||
}
|
||||
return fileName;
|
||||
}
|
||||
|
||||
@ApiOperation(value = "存储在线编辑文件")
|
||||
@GetMapping("/saveEditFile")
|
||||
public BusProcessModelHis saveEditFile(String model){
|
||||
return workFlowFeignClient.saveEditFile(model);
|
||||
public BusProcessModelHis saveEditFile(String model) {
|
||||
return workFlowFeignClient.saveEditFile(model);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询在线编辑流程汇总文件编辑对象")
|
||||
@GetMapping("/processEditFile")
|
||||
public BusProcessModelHis processEditFile(@RequestParam("id") String id){
|
||||
return workFlowFeignClient.processEditFile(id);
|
||||
public BusProcessModelHis processEditFile(@RequestParam("id") String id) {
|
||||
return workFlowFeignClient.processEditFile(id);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "手机获取token")
|
||||
@@ -191,14 +191,14 @@ public class WorkFlowController {
|
||||
@ResponseBody
|
||||
public ResponseMessage<String> loginMobile(String taskIds, String pId) throws UnsupportedEncodingException {
|
||||
BusProcessNew busProcessNew = workFlowFeignClient.queryDetail(taskIds);
|
||||
if(busProcessNew == null || StringUtils.isBlank(busProcessNew.getUserId())){
|
||||
if (busProcessNew == null || StringUtils.isBlank(busProcessNew.getUserId())) {
|
||||
return Result.error("r0011", "用户不存在");
|
||||
}
|
||||
TsUser userEO = userService.getById(busProcessNew.getUserId());
|
||||
if (null == userEO) {
|
||||
return Result.error("r0011", "用户不存在");
|
||||
}
|
||||
if(userEO.getDisableFlag().equals("1")){
|
||||
if (userEO.getDisableFlag().equals("1")) {
|
||||
return Result.error("r0011", "帐号已禁用");
|
||||
}
|
||||
String token = jwtUtils.generateToken(userEO.getUserId());
|
||||
@@ -206,78 +206,77 @@ public class WorkFlowController {
|
||||
// 加密重要信息
|
||||
BASE64Encoder encoder = new BASE64Encoder();
|
||||
String userStr = JSON.toJSONString(userEO);
|
||||
String userStr2 = URLEncoder.encode(userStr,"UTF-8");
|
||||
String userStr2 = URLEncoder.encode(userStr, "UTF-8");
|
||||
userStr = encoder.encode(userStr2.getBytes());
|
||||
return Result.success(userStr);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ApiOperation(value = "查询在线编辑流程汇总文件编辑对象")
|
||||
@GetMapping("/processModelHisOneCount")
|
||||
public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid){
|
||||
return workFlowFeignClient.processModelHisOneCount(pid);
|
||||
public BusProcessModelHis processModelHisOneCount(@RequestParam("pid") String pid) {
|
||||
return workFlowFeignClient.processModelHisOneCount(pid);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "更新在线编辑流程当前节点编辑状态")
|
||||
@GetMapping("/processModelHisOneUpd")
|
||||
public BusProcessModelHis processModelHisOneUpd(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){
|
||||
return workFlowFeignClient.processModelHisOneUpdStatus(pid,taskId);
|
||||
public BusProcessModelHis processModelHisOneUpd(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId) {
|
||||
return workFlowFeignClient.processModelHisOneUpdStatus(pid, taskId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询在线编辑流程当前节点编辑对象")
|
||||
@GetMapping("/processModelHisOne")
|
||||
public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid,@RequestParam("taskId") String taskId){
|
||||
return workFlowFeignClient.processModelHisOne(pid,taskId);
|
||||
public BusProcessModelHis processModelHisOne(@RequestParam("pid") String pid, @RequestParam("taskId") String taskId) {
|
||||
return workFlowFeignClient.processModelHisOne(pid, taskId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "根据pid 节点信息查询")
|
||||
@GetMapping("/evaluationHisListByOne")
|
||||
public BusProcessEvaluationHis evaluationHisListByOne(@RequestParam("pid") String pid,@RequestParam("taskInfo") String taskInfo){
|
||||
return workFlowFeignClient.evaluationHisListByOne(pid,taskInfo);
|
||||
public BusProcessEvaluationHis evaluationHisListByOne(@RequestParam("pid") String pid, @RequestParam("taskInfo") String taskInfo) {
|
||||
return workFlowFeignClient.evaluationHisListByOne(pid, taskInfo);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询流程父节点所有评分(去重)返回节点评分总数")
|
||||
@GetMapping("/evaluationHisListRepSum")
|
||||
public Map<String,Integer> evaluationHisListRepSum(@RequestParam("pid") String pid){
|
||||
return workFlowFeignClient.evaluationHisListRepSum(pid);
|
||||
public Map<String, Integer> evaluationHisListRepSum(@RequestParam("pid") String pid) {
|
||||
return workFlowFeignClient.evaluationHisListRepSum(pid);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询流程父节点所有评分(去重)")
|
||||
@GetMapping("/evaluationHisListRep")
|
||||
public List<BusProcessEvaluationHis> evaluationHisListRep(@RequestParam("pid") String pid){
|
||||
return workFlowFeignClient.evaluationHisListRep(pid);
|
||||
public List<BusProcessEvaluationHis> evaluationHisListRep(@RequestParam("pid") String pid) {
|
||||
return workFlowFeignClient.evaluationHisListRep(pid);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询流程父节点所有评分")
|
||||
@GetMapping("/evaluationHisList")
|
||||
public List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid){
|
||||
return workFlowFeignClient.evaluationHisList(pid);
|
||||
public List<BusProcessEvaluationHis> evaluationHisList(@RequestParam("pid") String pid) {
|
||||
return workFlowFeignClient.evaluationHisList(pid);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "干活流程接收待办")
|
||||
@GetMapping("/execTask")
|
||||
public Map<String,Object> execTask(@RequestParam("todoId") String todoId){
|
||||
return workFlowFeignClient.execTask(todoId);
|
||||
public Map<String, Object> execTask(@RequestParam("todoId") String todoId) {
|
||||
return workFlowFeignClient.execTask(todoId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "管控流程接收任务")
|
||||
@GetMapping("/acceptTack")
|
||||
public Integer acceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("taskId") String taskId) {
|
||||
sarAgenldAcceptButtonService.add(taskId);
|
||||
return workFlowFeignClient.acceptTack(nowEsId,oaFlag,taskId);
|
||||
return workFlowFeignClient.acceptTack(nowEsId, oaFlag, taskId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "管控流程判断接收任务")
|
||||
@GetMapping("/judgeAcceptTack")
|
||||
public ResponseMessage<Boolean> judgeAcceptTack(@RequestParam("nowEsId") String nowEsId, @RequestParam("oaFlag") String oaFlag, @RequestParam("prcIdGk") String prcIdGk) {
|
||||
return Result.success(workFlowFeignClient.judgeAcceptTack(nowEsId,oaFlag,prcIdGk));
|
||||
return Result.success(workFlowFeignClient.judgeAcceptTack(nowEsId, oaFlag, prcIdGk));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "流程实例明细验证是否完成")
|
||||
@GetMapping("/get_verify_by_instance")
|
||||
public Map<String,Object> activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){
|
||||
return workFlowFeignClient.get_verify_by_instance(taskId,pId);
|
||||
public Map<String, Object> activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId) {
|
||||
return workFlowFeignClient.get_verify_by_instance(taskId, pId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "导出excel")
|
||||
@@ -288,7 +287,7 @@ public class WorkFlowController {
|
||||
// if(exportExcel==null||exportExcel.getJson()==null)return;
|
||||
// ExportExcelEO exportExcelEO=JSON.parseObject(exportExcel.getJson(),ExportExcelEO.class);
|
||||
|
||||
if(exportExcelEO.getFileName()==null||exportExcelEO.getFileName().trim().length()==0){
|
||||
if (exportExcelEO.getFileName() == null || exportExcelEO.getFileName().trim().length() == 0) {
|
||||
exportExcelEO.setFileName(UUID.fastUUID().toString(true));
|
||||
}
|
||||
List<Map<String, Object>> dataList = exportExcelEO.getDataList().stream()
|
||||
@@ -319,77 +318,77 @@ public class WorkFlowController {
|
||||
// }
|
||||
|
||||
|
||||
|
||||
@ApiOperation(value = "启动流程-以流程定义id")
|
||||
@GetMapping("/activiti_define_start")
|
||||
public ResponseMessage activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam(value = "bpnId",required = false) String bpnId){
|
||||
return workFlowFeignClient.activiti_define_start(id,userId,bpnId);
|
||||
public ResponseMessage activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam(value = "bpnId", required = false) String bpnId) {
|
||||
return workFlowFeignClient.activiti_define_start(id, userId, bpnId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "启动流程-以流程定义id")
|
||||
@GetMapping("/activiti_define_start_rollBack")
|
||||
public ResponseMessage activiti_define_start_rollBack(@RequestParam("id") String id, @RequestParam("userId") String userId,
|
||||
@RequestParam(value = "bpnId",required = false) String bpnId,@RequestParam(value = "json",required = false)String json){
|
||||
return workFlowFeignClient.activiti_define_start_rollBack(id,userId,bpnId,json);
|
||||
@RequestParam(value = "bpnId", required = false) String bpnId, @RequestParam(value = "json", required = false) String json) {
|
||||
return workFlowFeignClient.activiti_define_start_rollBack(id, userId, bpnId, json);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "启动流程-以流程定义id")
|
||||
@GetMapping("/activiti_define_start1")
|
||||
public Map<String,String> activiti_define_start1(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("standName") String standName){
|
||||
return workFlowFeignClient.activiti_define_start1(id,userId,standName);
|
||||
public Map<String, String> activiti_define_start1(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("standName") String standName) {
|
||||
return workFlowFeignClient.activiti_define_start1(id, userId, standName);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "启动流程-以流程定义id")
|
||||
@GetMapping("/startProcess")
|
||||
public ResponseMessage startProcess(@RequestParam("type") String type, @RequestParam(value="id",required = false) String id){
|
||||
if(StringUtils.isNotBlank(type)){
|
||||
return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), LoginUserUtil.getUserId(),id);
|
||||
}else {
|
||||
public ResponseMessage startProcess(@RequestParam("type") String type, @RequestParam(value = "id", required = false) String id) {
|
||||
if (StringUtils.isNotBlank(type)) {
|
||||
return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), LoginUserUtil.getUserId(), id);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "启动流程-以流程定义id-加上草稿内容（为了实现撤回）")
|
||||
@PostMapping("/startProcessRollBack")
|
||||
public ResponseMessage startProcessRollBack(ProcessRollBackEO processRollBackEO){
|
||||
if(StringUtils.isNotBlank(processRollBackEO.getType())){
|
||||
return this.activiti_define_start_rollBack(ActDefineStartMap.actDefineStartMap(processRollBackEO.getType()), LoginUserUtil.getUserId(),processRollBackEO.getId(),processRollBackEO.getJson());
|
||||
}else {
|
||||
public ResponseMessage startProcessRollBack(ProcessRollBackEO processRollBackEO) {
|
||||
if (StringUtils.isNotBlank(processRollBackEO.getType())) {
|
||||
return this.activiti_define_start_rollBack(ActDefineStartMap.actDefineStartMap(processRollBackEO.getType()), LoginUserUtil.getUserId(), processRollBackEO.getId(), processRollBackEO.getJson());
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "定时任务启动流程-以流程定义id")
|
||||
@GetMapping("/startProcessNew")
|
||||
public ResponseMessage startProcessNew(@RequestParam("type") String type, @RequestParam(value="userId",required = false) String userId, @RequestParam(value="id",required = false) String id){
|
||||
if(StringUtils.isNotBlank(type)){
|
||||
return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), userId,id);
|
||||
}else {
|
||||
public ResponseMessage startProcessNew(@RequestParam("type") String type, @RequestParam(value = "userId", required = false) String userId, @RequestParam(value = "id", required = false) String id) {
|
||||
if (StringUtils.isNotBlank(type)) {
|
||||
return this.activiti_define_start(ActDefineStartMap.actDefineStartMap(type), userId, id);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@ApiOperation(value = "待办任务详情")
|
||||
@GetMapping("/todotask")
|
||||
public PageInfo<BusProcessNew> todotask(@RequestParam("userId") String userId, @RequestParam("pId") String pId){
|
||||
@GetMapping("/todotask")
|
||||
public PageInfo<BusProcessNew> todotask(@RequestParam("userId") String userId, @RequestParam("pId") String pId) {
|
||||
workFlowFeignClient.todotask(userId, pId);
|
||||
return null;
|
||||
}
|
||||
|
||||
@ApiOperation(value = "详情")
|
||||
@GetMapping("/queryDetail")
|
||||
public BusProcessNew queryDetail(@RequestParam("taskIds") String taskIds){
|
||||
public BusProcessNew queryDetail(@RequestParam("taskIds") String taskIds) {
|
||||
return workFlowFeignClient.queryDetail(taskIds);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "入库联络人详情")
|
||||
@GetMapping("/inboundLiaisonDetail")
|
||||
public BusProcessNew inboundLiaisonDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId) {
|
||||
return workFlowFeignClient.inboundLiaisonDetail(taskIds,pId);
|
||||
return workFlowFeignClient.inboundLiaisonDetail(taskIds, pId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "入库联络人详情")
|
||||
@GetMapping("/nonconformity")
|
||||
public String nonconformity(@RequestParam("taskIds") String taskIds){
|
||||
public String nonconformity(@RequestParam("taskIds") String taskIds) {
|
||||
return workFlowFeignClient.nonconformity(taskIds);
|
||||
}
|
||||
|
||||
@@ -443,7 +442,7 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "企标制修订评估详情")
|
||||
@GetMapping("/qbzxdpgDetail")
|
||||
public String qbzxdpgDetail(@RequestParam("taskIds")String taskIds){
|
||||
public String qbzxdpgDetail(@RequestParam("taskIds") String taskIds) {
|
||||
return workFlowFeignClient.qbzxdpgDetail(taskIds);
|
||||
}
|
||||
|
||||
@@ -461,64 +460,65 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "保存任务")
|
||||
@PostMapping("/saveTask")
|
||||
public Wrapper<String> saveTask(@RequestBody BusMes busMes){
|
||||
public Wrapper<String> saveTask(@RequestBody BusMes busMes) {
|
||||
return workFlowFeignClient.saveTask(busMes);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "行政管理要求评估流程保存")
|
||||
@PostMapping("/saveTaskForXZYQ")
|
||||
public Wrapper<String> saveTaskForXZYQ(BusMes busMes){
|
||||
public Wrapper<String> saveTaskForXZYQ(BusMes busMes) {
|
||||
return workFlowFeignClient.saveTaskForXZYQ(busMes);
|
||||
}
|
||||
|
||||
/**
|
||||
* 复审流程使用
|
||||
*
|
||||
* @param busMes
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value = "保存到代办")
|
||||
@ApiOperation(value = "保存到代办")
|
||||
@PostMapping("/autoSaveFirst1")
|
||||
public Wrapper<String> autoSaveFirst1(@RequestBody BusMes busMes){
|
||||
public Wrapper<String> autoSaveFirst1(@RequestBody BusMes busMes) {
|
||||
return workFlowFeignClient.autoSaveFirst1(busMes);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "改派")
|
||||
@GetMapping("/changeAssigneeNew")
|
||||
public Wrapper<String> run(@RequestParam("taskId")String taskId, @RequestParam("assignee") String assignee,
|
||||
@RequestParam("userId")String userId, @RequestParam("pId") String pId) {
|
||||
return workFlowFeignClient.run(taskId,assignee,userId,pId);
|
||||
public Wrapper<String> run(@RequestParam("taskId") String taskId, @RequestParam("assignee") String assignee,
|
||||
@RequestParam("userId") String userId, @RequestParam("pId") String pId) {
|
||||
return workFlowFeignClient.run(taskId, assignee, userId, pId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "我的已办任务列表")
|
||||
@PostMapping("/hastodoTasksList")
|
||||
public Wrapper<Map<String, Object>> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery){
|
||||
public Wrapper<Map<String, Object>> HastodoTasksListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) {
|
||||
return workFlowFeignClient.HastodoTasksListByUserId(taskCommonQuery);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "我的待办任务列表")
|
||||
@PostMapping("/todoTaskList")
|
||||
public PageInfo<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery){
|
||||
public PageInfo<BusProcessName> todoTaskListByUserId(@RequestBody TaskCommonQuery taskCommonQuery) {
|
||||
List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery);
|
||||
List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
|
||||
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
|
||||
if(busProcessNames!=null){
|
||||
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
|
||||
if (busProcessNames != null) {
|
||||
pageInfo.setList(list1);
|
||||
pageInfo.setPageNo(taskCommonQuery.getCurrent());
|
||||
pageInfo.setCount(Long.valueOf(busProcessNames.size()));
|
||||
pageInfo.setPageSize(taskCommonQuery.getSize());
|
||||
}else{
|
||||
} else {
|
||||
List<BusProcessName> list = new ArrayList<>();
|
||||
pageInfo.setList(list);
|
||||
pageInfo.setPageNo(taskCommonQuery.getCurrent());
|
||||
pageInfo.setCount(Long.valueOf(0));
|
||||
pageInfo.setPageSize(taskCommonQuery.getSize());
|
||||
}
|
||||
for (BusProcessName data : pageInfo.getList()){
|
||||
if(StringUtils.isNotBlank(data.getTaskIds())){
|
||||
for (BusProcessName data : pageInfo.getList()) {
|
||||
if (StringUtils.isNotBlank(data.getTaskIds())) {
|
||||
String s = sarAgenldAcceptButtonService.selectIsNot(data.getTaskIds());
|
||||
if(s.equals("1")){
|
||||
if (s.equals("1")) {
|
||||
data.setShowreceive(false);
|
||||
}else {
|
||||
} else {
|
||||
data.setShowreceive(true);
|
||||
}
|
||||
}
|
||||
@@ -528,16 +528,16 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "我的待办任务列表")
|
||||
@PostMapping("/todoTaskListNew")
|
||||
public PageInfo<BusProcessName> todoTaskListNew(@RequestBody TaskCommonQuery taskCommonQuery){
|
||||
public PageInfo<BusProcessName> todoTaskListNew(@RequestBody TaskCommonQuery taskCommonQuery) {
|
||||
List<BusProcessName> busProcessNames = workFlowFeignClient.todoTaskListByUserId(taskCommonQuery);
|
||||
List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
|
||||
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
|
||||
if(busProcessNames!=null){
|
||||
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
|
||||
if (busProcessNames != null) {
|
||||
pageInfo.setList(list1);
|
||||
pageInfo.setPageNo(taskCommonQuery.getCurrent());
|
||||
pageInfo.setCount(Long.valueOf(busProcessNames.size()));
|
||||
pageInfo.setPageSize(taskCommonQuery.getSize());
|
||||
}else{
|
||||
} else {
|
||||
List<BusProcessName> list = new ArrayList<>();
|
||||
pageInfo.setList(list);
|
||||
pageInfo.setPageNo(taskCommonQuery.getCurrent());
|
||||
@@ -549,9 +549,9 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "完成任务")
|
||||
@PostMapping("/completeTask")
|
||||
public Wrapper<String> completeTaskByUserId( BusMes busMes){
|
||||
public Wrapper<String> completeTaskByUserId(BusMes busMes) {
|
||||
Wrapper<String> str = workFlowFeignClient.completeTaskByUserId(busMes);
|
||||
if(str.getCode() == 500){
|
||||
if (str.getCode() == 500) {
|
||||
str.setSuccess(false);
|
||||
}
|
||||
return str;
|
||||
@@ -559,9 +559,9 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "特殊完成任务节点 会更·改草稿")
|
||||
@PostMapping("/completeTaskNew")
|
||||
public Wrapper<String> completeTaskByUserIdNew( BusMesSpecial busMes){
|
||||
public Wrapper<String> completeTaskByUserIdNew(BusMesSpecial busMes) {
|
||||
Wrapper<String> str = workFlowFeignClient.completeTaskByUserIdNew(busMes);
|
||||
if(str.getCode() == 500){
|
||||
if (str.getCode() == 500) {
|
||||
str.setSuccess(false);
|
||||
}
|
||||
return str;
|
||||
@@ -569,90 +569,90 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "保存标准入库流程")
|
||||
@PostMapping("/saveinboundTask")
|
||||
public Wrapper<String> saveinboundTask(BusMes busMes){
|
||||
public Wrapper<String> saveinboundTask(BusMes busMes) {
|
||||
return workFlowFeignClient.saveinboundTask(busMes);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "整改流程保存")
|
||||
@PostMapping("/saveUnqualified")
|
||||
public Wrapper<String> saveUnqualified(BusMes busMes){
|
||||
public Wrapper<String> saveUnqualified(BusMes busMes) {
|
||||
return workFlowFeignClient.saveUnqualified(busMes);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "国内法规入库技术评估流程保存")
|
||||
@PostMapping("/saveInboundLiaisonDetailForLawsAss")
|
||||
public Wrapper<String> saveInboundLiaisonDetailForLawsAss(BusMes busMes){
|
||||
public Wrapper<String> saveInboundLiaisonDetailForLawsAss(BusMes busMes) {
|
||||
return workFlowFeignClient.saveInboundLiaisonDetailForLawsAss(busMes);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "国内法规入库项目评估流程保存")
|
||||
@PostMapping("/saveProjectAssessDetail2")
|
||||
public Wrapper<String> saveProjectAssessDetail2(BusMes busMes){
|
||||
public Wrapper<String> saveProjectAssessDetail2(BusMes busMes) {
|
||||
return workFlowFeignClient.saveProjectAssessDetail2(busMes);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "国内法规入库项目评估流程保存")
|
||||
@PostMapping("/saveProjectAssessDetail3")
|
||||
public Wrapper<String> saveProjectAssessDetail3(BusMes busMes){
|
||||
public Wrapper<String> saveProjectAssessDetail3(BusMes busMes) {
|
||||
return workFlowFeignClient.saveProjectAssessDetail3(busMes);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "国内法规入库项目评估流程保存")
|
||||
@PostMapping("/saveProjectAssessDetail4")
|
||||
public Wrapper<String> saveProjectAssessDetail4(BusMes busMes){
|
||||
public Wrapper<String> saveProjectAssessDetail4(BusMes busMes) {
|
||||
return workFlowFeignClient.saveProjectAssessDetail4(busMes);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "国内法规入库项目评估流程保存")
|
||||
@PostMapping("/saveProjectAssessDetail5")
|
||||
public Wrapper<String> saveProjectAssessDetail5(BusMes busMes){
|
||||
public Wrapper<String> saveProjectAssessDetail5(BusMes busMes) {
|
||||
return workFlowFeignClient.saveProjectAssessDetail5(busMes);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "政策法规评估流程保存")
|
||||
@PostMapping("/saveZcfgpg")
|
||||
public Wrapper<String> saveZcfgpg(BusMes busMes){
|
||||
public Wrapper<String> saveZcfgpg(BusMes busMes) {
|
||||
return workFlowFeignClient.saveZcfgpg(busMes);
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "国内法规入库评估流程保存")
|
||||
@PostMapping("/saveTaskForPub")
|
||||
public Wrapper<String> saveTaskForPub(BusMes busMes){
|
||||
public Wrapper<String> saveTaskForPub(BusMes busMes) {
|
||||
return workFlowFeignClient.saveTaskForPub(busMes);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "保存任务第一步")
|
||||
@PostMapping("/saveTaskFirst")
|
||||
public Wrapper<String> saveTaskFirst(BusMes busMes){
|
||||
public Wrapper<String> saveTaskFirst(BusMes busMes) {
|
||||
|
||||
return workFlowFeignClient.saveTaskFirst(busMes);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询任务第一步")
|
||||
@GetMapping("/queryTaskFirst")
|
||||
public BusProcessName queryTaskFirst(@RequestParam("bpnId")String bpnId) {
|
||||
public BusProcessName queryTaskFirst(@RequestParam("bpnId") String bpnId) {
|
||||
return workFlowFeignClient.queryTaskFirst(bpnId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询taskid任务")
|
||||
@GetMapping("/queryTaskIndex")
|
||||
public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId,@RequestParam("taskIds") String taskIds){
|
||||
return workFlowFeignClient.queryTaskIndex(prcId,taskIds);
|
||||
public BusProcessNew queryTaskIndex(@RequestParam("prcId") String prcId, @RequestParam("taskIds") String taskIds) {
|
||||
return workFlowFeignClient.queryTaskIndex(prcId, taskIds);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询草稿")
|
||||
@PostMapping("/queryTaskDraft")
|
||||
public PageInfo<BusProcessName> queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery){
|
||||
public PageInfo<BusProcessName> queryTaskDraft(@RequestBody TaskCommonQuery taskCommonQuery) {
|
||||
List<BusProcessName> busProcessNames = workFlowFeignClient.queryTaskDraft(taskCommonQuery);
|
||||
List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize());
|
||||
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
|
||||
if(busProcessNames!=null){
|
||||
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
|
||||
if (busProcessNames != null) {
|
||||
pageInfo.setList(list1);
|
||||
pageInfo.setPageNo(taskCommonQuery.getCurrent());
|
||||
pageInfo.setCount(Long.valueOf(busProcessNames.size()));
|
||||
pageInfo.setPageSize(taskCommonQuery.getSize());
|
||||
}else{
|
||||
} else {
|
||||
List<BusProcessName> list = new ArrayList<BusProcessName>();
|
||||
pageInfo.setList(list);
|
||||
pageInfo.setPageNo(taskCommonQuery.getCurrent());
|
||||
@@ -664,33 +664,33 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "定时任务发起流程")
|
||||
@PostMapping("/autoSaveFirst")
|
||||
public Wrapper<String> autoSaveFirst(@RequestBody BusMes busMes){
|
||||
public Wrapper<String> autoSaveFirst(@RequestBody BusMes busMes) {
|
||||
return workFlowFeignClient.autoSaveFirst(busMes);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询流程是否结束")
|
||||
@GetMapping("/isEnd")
|
||||
public String isEnd(@RequestParam("pId")String pId){
|
||||
public String isEnd(@RequestParam("pId") String pId) {
|
||||
return workFlowFeignClient.isEnd(pId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "删除流程")
|
||||
@GetMapping("/deleteProcessInstance")
|
||||
public Wrapper<String> deleteProcessInstance(@RequestParam("pId")String pId){
|
||||
public Wrapper<String> deleteProcessInstance(@RequestParam("pId") String pId) {
|
||||
return workFlowFeignClient.deleteProcessInstance(pId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "删除草稿")
|
||||
@GetMapping("/deleteDraft")
|
||||
public Wrapper<String> deleteDraft(@RequestParam("id")String id){
|
||||
public Wrapper<String> deleteDraft(@RequestParam("id") String id) {
|
||||
return workFlowFeignClient.deleteDraft(id);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "已发流程")
|
||||
@PostMapping("/IssuedProcess")
|
||||
public PageInfo<BusProcessName> IssuedProcess(@RequestBody TaskCommonQuery taskCommonQuery){
|
||||
public PageInfo<BusProcessName> IssuedProcess(@RequestBody TaskCommonQuery taskCommonQuery) {
|
||||
Page page = workFlowFeignClient.issuedProcess(taskCommonQuery);
|
||||
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
|
||||
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
|
||||
pageInfo.setList(page.getList());
|
||||
pageInfo.setPageNo(taskCommonQuery.getCurrent());
|
||||
pageInfo.setCount(Long.valueOf(page.getCount()));
|
||||
@@ -700,9 +700,9 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "已办流程")
|
||||
@PostMapping("/doneProcess")
|
||||
public PageInfo<BusProcessName> doneProcess(@RequestBody TaskCommonQuery taskCommonQuery){
|
||||
public PageInfo<BusProcessName> doneProcess(@RequestBody TaskCommonQuery taskCommonQuery) {
|
||||
Page page = workFlowFeignClient.doneProcess(taskCommonQuery);
|
||||
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
|
||||
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
|
||||
pageInfo.setList(page.getList());
|
||||
pageInfo.setPageNo(page.getPageNo());
|
||||
pageInfo.setCount(page.getCount());
|
||||
@@ -712,8 +712,9 @@ public class WorkFlowController {
|
||||
|
||||
/**
|
||||
* 开始分页
|
||||
*
|
||||
* @param list
|
||||
* @param pageNum 页码
|
||||
* @param pageNum 页码
|
||||
* @param pageSize 每页多少条数据
|
||||
* @return
|
||||
*/
|
||||
@@ -752,19 +753,19 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "流程实例明细列表")
|
||||
@GetMapping("/get_list_by_instance")
|
||||
public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
|
||||
return workFlowFeignClient.get_list_by_instance(prcNum,sortWord,shunxu);
|
||||
public List<Map<String, Object>> get_list_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value = "sortWord", required = false) String sortWord, @RequestParam(value = "shunxu", required = false) String shunxu) {
|
||||
return workFlowFeignClient.get_list_by_instance(prcNum, sortWord, shunxu);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "流程实例汇总列表")
|
||||
@GetMapping("/get_gather_by_instance")
|
||||
public List<Map<String, Object>> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value="sortWord",required = false)String sortWord, @RequestParam(value="shunxu",required = false) String shunxu){
|
||||
return workFlowFeignClient.get_gather_by_instance(prcNum,sortWord,shunxu);
|
||||
public List<Map<String, Object>> get_gather_by_instance(@RequestParam("prcNum") String prcNum, @RequestParam(value = "sortWord", required = false) String sortWord, @RequestParam(value = "shunxu", required = false) String shunxu) {
|
||||
return workFlowFeignClient.get_gather_by_instance(prcNum, sortWord, shunxu);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取图片")
|
||||
@GetMapping("/getImg")
|
||||
public void getImg(@RequestParam("prcNum")String prcNum, HttpServletResponse response) throws IOException {
|
||||
public void getImg(@RequestParam("prcNum") String prcNum, HttpServletResponse response) throws IOException {
|
||||
OutputStream os = null;
|
||||
response.setContentType("image/jpg");
|
||||
response.flushBuffer();
|
||||
@@ -776,11 +777,11 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "监控流程列表")
|
||||
@PostMapping("/allProcess")
|
||||
public PageInfo<BusProcessName> allProcess(@RequestBody TaskCommonQuery taskCommonQuery){
|
||||
Page page= workFlowFeignClient.allProcess(taskCommonQuery);
|
||||
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
|
||||
public PageInfo<BusProcessName> allProcess(@RequestBody TaskCommonQuery taskCommonQuery) {
|
||||
Page page = workFlowFeignClient.allProcess(taskCommonQuery);
|
||||
PageInfo<BusProcessName> pageInfo = new PageInfo<BusProcessName>();
|
||||
pageInfo.setPageNo(taskCommonQuery.getCurrent());
|
||||
pageInfo.setList(page.getList() == null ? new ArrayList<>():page.getList());
|
||||
pageInfo.setList(page.getList() == null ? new ArrayList<>() : page.getList());
|
||||
pageInfo.setCount(page.getCount() == null ? 0 : page.getCount());
|
||||
pageInfo.setPageSize(page.getPageSize() == null ? 0 : page.getPageSize());
|
||||
return pageInfo;
|
||||
@@ -801,25 +802,25 @@ public class WorkFlowController {
|
||||
response.setContentType("application/force-download");
|
||||
ExportParams exportParams = new ExportParams();
|
||||
exportParams.setType(ExcelType.XSSF);
|
||||
List<Map<String, Object>> list = workFlowFeignClient.get_list_by_instance(prcNum,null,null);
|
||||
List<ProcessDetailExport> exportDatas=new ArrayList<>();
|
||||
List<Map<String, Object>> list = workFlowFeignClient.get_list_by_instance(prcNum, null, null);
|
||||
List<ProcessDetailExport> exportDatas = new ArrayList<>();
|
||||
List<String> listId = Arrays.asList(idAndSartypeList.split(","));
|
||||
for(Map<String, Object> map:list){
|
||||
for(String id:listId){
|
||||
if(id.equals(map.get("id").toString())){
|
||||
if(map.get("endTime")!=null){
|
||||
map.put("flag","已完成");
|
||||
}else{
|
||||
map.put("flag","未完成");
|
||||
for (Map<String, Object> map : list) {
|
||||
for (String id : listId) {
|
||||
if (id.equals(map.get("id").toString())) {
|
||||
if (map.get("endTime") != null) {
|
||||
map.put("flag", "已完成");
|
||||
} else {
|
||||
map.put("flag", "未完成");
|
||||
}
|
||||
if(map.get("comment")!=null && !map.get("comment").toString().equals("")){
|
||||
if (map.get("comment") != null && !map.get("comment").toString().equals("")) {
|
||||
String comment = map.get("comment").toString();
|
||||
switch (comment){
|
||||
switch (comment) {
|
||||
case "0":
|
||||
map.put("comment","同意");
|
||||
map.put("comment", "同意");
|
||||
break;
|
||||
case "1":
|
||||
map.put("comment","不同意");
|
||||
map.put("comment", "不同意");
|
||||
break;
|
||||
default:
|
||||
}
|
||||
@@ -846,56 +847,56 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "强制撤回")
|
||||
@GetMapping("/forceRecall")
|
||||
public Wrapper<String> forceRecall(@RequestParam("prcId") String prcId){
|
||||
public Wrapper<String> forceRecall(@RequestParam("prcId") String prcId) {
|
||||
return workFlowFeignClient.forceRecall(prcId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "流程分类列表")
|
||||
@GetMapping("/categoryList")
|
||||
public Wrapper<List<Category>> categoryList(){
|
||||
public Wrapper<List<Category>> categoryList() {
|
||||
return workFlowFeignClient.categoryList();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "添加流程分类")
|
||||
@PostMapping("/addCategory")
|
||||
public Wrapper<String> addCategory(@RequestBody Category category){
|
||||
public Wrapper<String> addCategory(@RequestBody Category category) {
|
||||
return workFlowFeignClient.addCategory(category);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "删除流程分类")
|
||||
@GetMapping("/deleteCategory")
|
||||
public Wrapper<String> deleteCategory(@RequestParam("objectId") String objectId){
|
||||
public Wrapper<String> deleteCategory(@RequestParam("objectId") String objectId) {
|
||||
return workFlowFeignClient.deleteCategory(objectId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "编辑流程分类")
|
||||
@PostMapping("/editCategory")
|
||||
public Wrapper<String> editCategory(@RequestBody Category category){
|
||||
public Wrapper<String> editCategory(@RequestBody Category category) {
|
||||
return workFlowFeignClient.editCategory(category);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询流程")
|
||||
@GetMapping("/modelListPage")
|
||||
public Wrapper<Map<String, Object>> modelListPage(@RequestParam(value="name",required = false)String name, @RequestParam(value="category_id ",required = false)String category_id,
|
||||
@RequestParam("current")int current, @RequestParam("size")int size){
|
||||
return workFlowFeignClient.modelListPage(name,category_id,current,size);
|
||||
public Wrapper<Map<String, Object>> modelListPage(@RequestParam(value = "name", required = false) String name, @RequestParam(value = "category_id ", required = false) String category_id,
|
||||
@RequestParam("current") int current, @RequestParam("size") int size) {
|
||||
return workFlowFeignClient.modelListPage(name, category_id, current, size);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "政策法规入库评估查看最后数据")
|
||||
@GetMapping("/zcfgrkpgDetail")
|
||||
public List<BusProcessNew> zcfgrkpgDetail(@RequestParam("pId") String pId){
|
||||
public List<BusProcessNew> zcfgrkpgDetail(@RequestParam("pId") String pId) {
|
||||
return workFlowFeignClient.zcfgrkpgDetail(pId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "修改流程所属分类")
|
||||
@GetMapping("/updatModel")
|
||||
public Wrapper<String> updatModel(@RequestParam("modelId")String modelId, @RequestParam("categoryId")String categoryId){
|
||||
return workFlowFeignClient.updatModel(modelId,categoryId);
|
||||
public Wrapper<String> updatModel(@RequestParam("modelId") String modelId, @RequestParam("categoryId") String categoryId) {
|
||||
return workFlowFeignClient.updatModel(modelId, categoryId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "查询流程编号")
|
||||
@GetMapping("/findPrcNumByPid")
|
||||
public Wrapper<String> findPrcNumByPid(@RequestParam("pId")String pId){
|
||||
public Wrapper<String> findPrcNumByPid(@RequestParam("pId") String pId) {
|
||||
return workFlowFeignClient.findPrcNumByPid(pId);
|
||||
}
|
||||
|
||||
@@ -907,8 +908,8 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "标准解读流程汇总详情")
|
||||
@GetMapping("/decodeDetail")
|
||||
public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId){
|
||||
return workFlowFeignClient.decodeDetail(taskIds,pId);
|
||||
public BusProcessNew decodeDetail(@RequestParam("taskIds") String taskIds, @RequestParam("pId") String pId) {
|
||||
return workFlowFeignClient.decodeDetail(taskIds, pId);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "采购保存接口")
|
||||
@@ -919,6 +920,7 @@ public class WorkFlowController {
|
||||
|
||||
@Autowired
|
||||
ProcessTimer processTimer;
|
||||
|
||||
@ApiOperation(value = "自动催办，任务截至时间前3天开始每天催办")
|
||||
@PostMapping("/send123")
|
||||
public String send123() {
|
||||
@@ -958,14 +960,14 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "草稿删除")
|
||||
@PostMapping("/delCG")
|
||||
public String delCG(@RequestParam("id")String id){
|
||||
public String delCG(@RequestParam("id") String id) {
|
||||
return workFlowFeignClient.delCG(id);
|
||||
}
|
||||
|
||||
|
||||
@ApiOperation(value = "通过企标计划和技术标准起草关联表查询对应的计划id")
|
||||
@GetMapping("/getEsByWk")
|
||||
public String getEsByWk(@RequestParam("prcId")String prcId){
|
||||
public String getEsByWk(@RequestParam("prcId") String prcId) {
|
||||
return workFlowFeignClient.getEsByWk(prcId);
|
||||
}
|
||||
|
||||
@@ -978,18 +980,14 @@ public class WorkFlowController {
|
||||
|
||||
@ApiOperation(value = "问答中心（第一个人回答以后删除其他人的代办任务以及OA提醒）")
|
||||
@PostMapping("/deleteReplyToenNotice")
|
||||
public List<BusProcessNew> deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer) {
|
||||
return workFlowFeignClient.deleteReplyToenNotice(taskId,answerer);
|
||||
public List<BusProcessNew> deleteReplyToenNotice(@RequestParam("taskId") String taskId, @RequestParam("answerer") String answerer) {
|
||||
return workFlowFeignClient.deleteReplyToenNotice(taskId, answerer);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "问答中心（通过taskId获取提问Id）")
|
||||
@GetMapping("/selectAskId")
|
||||
public String selectAskId(@RequestParam("taskId") String taskId) {
|
||||
return workFlowFeignClient.selectAskId(taskId);
|
||||
｝
|
||||
@ApiOperation(value = "OA待办强制删除")
|
||||
@GetMapping("/deleteOAByMandatory")
|
||||
public String deleteOAByMandatory(@RequestParam("todoId") String todoId,@RequestParam("assignee") String assignee) {
|
||||
return workFlowFeignClient.deleteOAByMandatory(todoId,assignee);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+4
-4
@@ -163,9 +163,9 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
|
||||
public ResponseMessage<Object> addPlan(EsRevisePlan esRevisePlan) {
|
||||
esRevisePlan.setId(UUIDUtils.randomUUID(32));
|
||||
List<EsRevisePlan> esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan);
|
||||
if (esRevisePlans.size()>0){
|
||||
return Result.success("企标名称不能重复,请更换新的企标名称");
|
||||
}else {
|
||||
// if (esRevisePlans.size()>0){
|
||||
// return Result.success("企标名称不能重复,请更换新的企标名称");
|
||||
// }else {
|
||||
esRevisePlanDao.insertOne(esRevisePlan);
|
||||
//加日志
|
||||
String esName = esRevisePlan.getEsName();
|
||||
@@ -181,7 +181,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
|
||||
}
|
||||
esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date));
|
||||
return Result.success("200", esRevisePlan.getId(), "操作成功");
|
||||
}
|
||||
//}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
*/
|
||||
public interface SarBussStandSnDao extends BaseMapper<SarBussStandSn> {
|
||||
|
||||
String selectMaxStandnSn();
|
||||
}
|
||||
|
||||
+3
@@ -16,4 +16,7 @@ public interface ISarBussStandSnService extends IService<SarBussStandSn> {
|
||||
Boolean verifySnExists(String taskId,String standSn,String standSort);
|
||||
|
||||
Boolean modSnByProcess(String taskId);
|
||||
|
||||
String selectMaxStandnSn();
|
||||
|
||||
}
|
||||
|
||||
+5
@@ -60,4 +60,9 @@ public class SarBussStandSnServiceImpl extends ServiceImpl<SarBussStandSnDao, Sa
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String selectMaxStandnSn() {
|
||||
return baseMapper.selectMaxStandnSn();
|
||||
}
|
||||
}
|
||||
|
||||
-1
@@ -130,6 +130,5 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
|
||||
@Select("select * from sar")
|
||||
String setDtqbbhbuss(String dtqbbhbuss);
|
||||
|
||||
String selectMaxStandnSn();
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -4320,7 +4320,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
|
||||
|
||||
@Override
|
||||
public ResponseMessage selectMaxStandnSn() {
|
||||
String max = baseMapper.selectMaxStandnSn();
|
||||
String max = iSarBussStandSnService.selectMaxStandnSn();
|
||||
int maxIOnfo = 0;
|
||||
if(StringUtils.isNotBlank(max)){
|
||||
int i = Integer.parseInt(max);
|
||||
|
||||
@@ -2,4 +2,8 @@
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.adc.da.slrs.sarBussStandSn.dao.SarBussStandSnDao">
|
||||
|
||||
<select id="selectMaxStandnSn" resultType="java.lang.String">
|
||||
select Max(STAND_SN) from sar_buss_stand_sn
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
-3
@@ -1255,7 +1255,4 @@
|
||||
where id = #{attfId}
|
||||
</update>
|
||||
|
||||
<select id="selectMaxStandnSn" resultType="java.lang.String">
|
||||
select Max(STAND_SN) from sar_bussioness_stand
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user