FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-wkflow-rest!30
This commit is contained in:
高嵩
2023-04-19 14:47:10 +08:00
parent 4be0779b73 3294708c25
commit 8718252bb7
6 changed files with 59 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+32 -4
View File
@@ -38,8 +38,10 @@ import org.activiti.engine.history.*;
import org.activiti.engine.repository.ProcessDefinition;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.runtime.ProcessInstanceQuery;
import org.activiti.engine.task.Comment;
import org.activiti.engine.task.NativeTaskQuery;
import org.activiti.engine.task.Task;
import org.activiti.engine.task.TaskQuery;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -1246,7 +1248,7 @@ public class TodoTaskController extends BaseAction {
public Wrapper<String> saveInboundLiaisonDetailForLawsAss(@RequestBody BusMes busMes) {
JSONObject object = JsonUtil.jsonStrToJsonObject(busMes.getJson());
JSONArray itemsList = object.getJSONArray("itemsList");
if (itemsList.size() > 0) {
if (itemsList != null) {
//有条款
JSONArray array = new JSONArray();
for (Object item : itemsList) {
@@ -2143,9 +2145,14 @@ public class TodoTaskController extends BaseAction {
// busProcessNew.setPrcName("");
// }
// }
}
}
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(busProcessName.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
List<HistoricTaskInstance> historicTaskInstanceQueryList = historicTaskInstanceQuery.list();
if(!historicTaskInstanceQueryList.isEmpty()){
busProcessName.setTaskInfo(historicTaskInstanceQueryList.get(0).getName());
}
if (assignee != null && !assignee.equals("")) {
busProcessName.setTaskAssignee(assignee.substring(0, assignee.length() - 1));
}
@@ -2268,8 +2275,15 @@ public class TodoTaskController extends BaseAction {
// busProcessNew.setPrcName("");
// }
// }
}
}
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(busProcessName.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
List<HistoricTaskInstance> historicTaskInstanceQueryList = historicTaskInstanceQuery.list();
if(!historicTaskInstanceQueryList.isEmpty()){
busProcessName.setTaskInfo(historicTaskInstanceQueryList.get(0).getName());
}
if (assignee != null && !assignee.equals("")) {
busProcessName.setTaskAssignee(assignee.substring(0, assignee.length() - 1));
}
@@ -2304,6 +2318,7 @@ public class TodoTaskController extends BaseAction {
String enddata = sdf.format(map.get(busProcessName.getPrcId()+"end"));
busProcessName.setEndTaskTime(enddata);
busProcessName.setStartTaskTime(startdata);
}
page.setList(list1);
page.setCount(Long.valueOf(list.size()));
@@ -2375,6 +2390,12 @@ public class TodoTaskController extends BaseAction {
}
}
}
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(busProcessName.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
List<HistoricTaskInstance> historicTaskInstanceQueryList = historicTaskInstanceQuery.list();
if(!historicTaskInstanceQueryList.isEmpty()){
busProcessName.setTaskInfo(historicTaskInstanceQueryList.get(0).getName());
}
if (assignee != null && !assignee.equals("")) {
busProcessName.setTaskAssignee(assignee.substring(0, assignee.length() - 1));
}
@@ -2763,12 +2784,19 @@ public class TodoTaskController extends BaseAction {
return busProcessNames;
}
@ApiOperation(value = "删除OA消息通知 起草专用")
@ApiOperation(value = "删除OA消息通知 制修订起草专用")
@GetMapping("/deleteOATask")
public String deleteOATask(@RequestParam("pId") String pId) {
//查询出当前数据
webServiceOAServiceImol.deleteOAByPidInfo(pId);
return "1";
}
@ApiOperation(value = "删除OA消息通知 通用")
@GetMapping("/deleteOATaskInfo")
public String deleteOATaskInfo(@RequestParam("pId") String pId) {
//查询出当前数据
webServiceOAServiceImol.deleteOAByPid(pId);
return "1";
}
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java
+7
View File
@@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.business_main.datas.controller;
import com.tmsps.fk.common.base.action.BaseAction;
import com.ydw.bat.wkflow.business_main.datas.entity.BusMes;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.util.http.ResponseMessage;
@@ -87,5 +88,11 @@ public class BusProcessNewController extends BaseAction {
public ResponseMessage<BusProcessNew> questionsAndAnswers(@RequestParam("askId") String askId, @RequestParam("answerer") String answerer) {
return iBusProcessNewService.questionsAndAnswers(askId,answerer);
}
@ApiOperation(value = "起草 保存（通过id和json进行修改数据）")
@GetMapping("/updateBusProcessNew")
public ResponseMessage<BusProcessNew> updateBusProcessNew(@RequestParam("id") String id, @RequestParam("mags") String mags) {
return iBusProcessNewService.updateBusProcessNew(id,mags);
}
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java
+2
View File
@@ -33,4 +33,6 @@ public interface BusProcessNewMapper extends BaseMapper<BusProcessNew> {
List<BusProcessNew> everyDayTenOlock();
List<BusProcessNew> everyDayTenOlockSAM();
void updateByIdinfo(String id, String mesg);
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java
+3
View File
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.business_main.datas.service;
import com.ydw.bat.wkflow.business_main.datas.entity.BusMes;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ydw.bat.wkflow.util.http.ResponseMessage;
@@ -47,4 +48,6 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
Map<String,Object> selectWenDan(String taskId);
ResponseMessage<BusProcessNew> questionsAndAnswers(String askId, String answerer);
ResponseMessage<BusProcessNew> updateBusProcessNew(String id, String mags);
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
+9
View File
@@ -3,8 +3,11 @@ package com.ydw.bat.wkflow.business_main.datas.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.additional.update.impl.UpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.entity.BusMes;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNewMapper;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
@@ -182,4 +185,10 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
}
return Result.error();
}
@Override
public ResponseMessage<BusProcessNew> updateBusProcessNew(String id, String mags) {
baseMapper.updateByIdinfo(id,mags);
return Result.success();
}
}
src/main/resources/mapper/datas/BusProcessNewMapper.xml
+6
View File
@@ -61,4 +61,10 @@
CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and
TASK_INFO = '标准化活动参会流程-流程结束'
</select>
<update id="updateByIdinfo">
update bus_process_new
set `MESG`= #{mesg}
where `ID` = #{id}
</update>
</mapper>