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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Superman_Main
2021-11-30 11:07:40 +08:00
parent 9ef1d01339 df6b9b7df7
commit bdf3d0b97f
10 changed files with 62 additions and 5 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
+14
View File
@@ -190,6 +190,20 @@ public class TodoTaskController extends BaseAction {
return todoList;
}
@ApiOperation(value = "我的待办任务列表速度优化项")
@ApiImplicitParams({@ApiImplicitParam(name = "name", value = "名称"),
@ApiImplicitParam(name = "current", value = "当前页"),
@ApiImplicitParam(name = "size", value = "每页条数"),
@ApiImplicitParam(name = "userId", value = "用户Id")})
@PostMapping("/todoTaskListNew")
public List<BusProcessName> todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery) {
// 创建查询对象
List<BusProcessName> busProcessNames=new ArrayList<>();
busProcessNames=iBusProcessNameService.todoTask(taskCommonQuery);
return busProcessNames;
}
@ApiOperation(value = "改派任务")
@ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"),
@ApiImplicitParam(name = "assignee", value = "改派人员")})
src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNameMapper.java
+3
View File
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.business_main.datas.mapper;
import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -19,4 +20,6 @@ public interface BusProcessNameMapper extends BaseMapper<BusProcessName> {
//查询符合要求的 name 信息
List<BusProcessName> findBusProcessNameForEnd(String taskId);
List<BusProcessName> todoTask(@Param("task") TaskCommonQuery taskCommonQuery);
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java
+4
View File
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.business_main.datas.service;
import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,4 +18,7 @@ import java.util.List;
public interface IBusProcessNameService extends IService<BusProcessName> {
List<BusProcessName> findBusProcessNameForEnd(String prcNum);
//新查询代办接口 初步测试中
List<BusProcessName> todoTask(TaskCommonQuery taskCommonQuery);
}
src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java
+6
View File
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.business_main.datas.service.impl;
import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNameMapper;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
@@ -28,4 +29,9 @@ public class BusProcessNameServiceImpl extends ServiceImpl<BusProcessNameMapper,
return busProcessNameMapper.findBusProcessNameForEnd(taskId);
}
@Override
public List<BusProcessName> todoTask(TaskCommonQuery taskCommonQuery) {
return busProcessNameMapper.todoTask(taskCommonQuery);
}
}
src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java
+4
View File
@@ -86,4 +86,8 @@ public class SarInterpretationNationalStandard {
private Date interpretationTime;
@ApiModelProperty(value = "风险程度")
private String riskDegree;
}
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java
+4 -2
View File
@@ -34,6 +34,8 @@ public class SelectResponsibleUserAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
object.put("docUser",delegateTask.getAssignee());
String userListString=object.getString("responUserList");
String userListStringName=object.getString("responUserListName");
@@ -54,9 +56,9 @@ public class SelectResponsibleUserAfter implements TaskListener {
json.put("dockUser",delegateTask.getAssignee());
responUserList.add(json);
strings.add(userList.get(i));
map.put(userList.get(i),json);
map.put(delegateTask.getAssignee()+userList.get(i),json);
}
///
delegateTask.setVariable("responUserList",responUserList);
if (null == delegateTask.getVariable("responUserLists",List.class)){
delegateTask.setVariable("responUserLists",strings);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class UploadResearchResultAfter implements TaskListener {
JSONArray responUserList = delegateTask.getVariable("responUserList", JSONArray.class);
String responUser = delegateTask.getVariable("responUser",String.class);
Map map=delegateTask.getVariable("datas",Map.class);
JSONObject os=JSONObject.parseObject(String.valueOf(map.get(responUser)));
JSONObject os=JSONObject.parseObject(String.valueOf(map.get(object.getString("docUser")+responUser)));
for (int i = 0; i < responUserList.size(); i++) {
JSONObject obj=responUserList.getJSONObject(i);
if (obj.getString("id").equals(responUser)
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+3 -2
View File
@@ -53,7 +53,7 @@ public class DeptApplayAfter implements TaskListener{
JSONObject os=JSONObject.parseObject(o.toString());
//分解单数据
SarStandItems sarStandItems1=new SarStandItems();
sarStandItems1.setFileType("FBGBJBD");
sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly",String.class));
sarStandItems1.setStandId(object.getString("standId"));
sarStandItems1.setItemsNum(os.getString("itemsNum"));
sarStandItems1.setItemsName(os.getString("itemsName"));
@@ -82,6 +82,7 @@ public class DeptApplayAfter implements TaskListener{
standard.setSpecificItem(os.getString("itemsNum"));
standard.setStandNumber(object.getString("itemsNum"));
standard.setInterpretationTime(delegateTask.getCreateTime());
standard.setRiskDegree("0");
standards.add(standard);
});
@@ -89,7 +90,7 @@ public class DeptApplayAfter implements TaskListener{
jsonArray1.forEach(obj ->{
JSONObject object1 = JSONObject.parseObject(obj.toString());
SarStandItems sarStandItems1=new SarStandItems();
sarStandItems1.setFileType("FBGBJBD");
sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly",String.class));
sarStandItems1.setStandId(object.getString("standId"));
sarStandItems1.setItemsNum(object1.getString("itemsNum"));
sarStandItems1.setItemsName(object1.getString("itemsName"));
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+1
View File
@@ -48,6 +48,7 @@ public class ResolveAfter implements TaskListener{
nextUserList.add(str);
}
// 配置多实例
delegateTask.setVariable("fileTypeOnly",object.getString("fileType"));
delegateTask.setVariable("zrUserList", nextUserList);
//拆分标准 解读中情况下 也展示数据
SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO();
src/main/resources/mapper/datas/BusProcessNameMapper.xml
+22
View File
@@ -29,4 +29,26 @@
AND BUS_PROCESS_NEW.TASK_ID = #{taskId}
</if>
</select>
<select id="todoTask" resultType="com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName">
SELECT DATE_FORMAT(bus_process_name.CREAT_TIME,'%Y-%m-%d %T') as creatTime,bus_process_name.CREAT_USER as creatUser
,bus_process_name.CREATE_USER_NAME as createUserName,DATE_FORMAT(bus_process_name.END_TIME,'%Y-%m-%d %T') as endTime
,bus_process_name.ID as id ,bus_process_name.MES as mes,DATE_FORMAT(bus_process_name.OVER_TIME,'%Y-%m-%d %T') as overTime
,bus_process_name.PRC_ID as prcId,bus_process_name.PRC_MES as prcMes, bus_process_new.PRC_NAME as prcName
,bus_process_name.PRC_NUM as prcNum,bus_process_name.PRC_TYPE as prcType,act_ru_task.ASSIGNEE_ as taskAssignee
,bus_process_new.TASK_ID as taskIds,bus_process_new.TASK_INFO as taskInfo
FROM act_ru_task
LEFT JOIN bus_process_name on bus_process_name.PRC_ID = act_ru_task.PROC_INST_ID_
LEFT JOIN bus_process_new on bus_process_new.TASK_ID =act_ru_task.ID_
WHERE act_ru_task.ASSIGNEE_ = #{task.userId}
<if test="null != task.prcName and '' !=task.prcName ">
and bus_process_new.PRC_NAME like concat(concat('%',#{task.prcName}),'%')
</if>
<if test="null != task.prcNum and '' !=task.prcNum ">
and bus_process_name.PRC_NUM like concat(concat('%',#{task.prcNum}),'%')
</if>
<if test="null != task.prcType and '' !=task.prcType ">
and bus_process_name.PRC_TYPE like concat(concat('%',#{task.prcNum}),'%')
</if>
</select>
</mapper>