Browse Source

优化需求

changchun
zhouhaibin 5 months ago
parent
commit
f7d8c8f1a9
  1. 2
      huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java
  2. 3
      huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java
  3. 48
      huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/WorkflowController.java
  4. 8
      huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/WorkflowMapper.java
  5. 77
      huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml
  6. 2
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java
  7. 9
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IWorkflowService.java
  8. 9
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java
  9. 3
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
  10. 8
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java
  11. 136
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java
  12. 38
      huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SuperLeaderApprovalDetailsOV.java
  13. 21
      huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/UrtsituationOV.java

2
huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlaninfofileController.java

@ -108,7 +108,7 @@ public class HuzhouPlaninfofileController {
return Result.ok(list);
}
@PostMapping("/setPlaninfoIsoffline")
public Result<String> setPlaninfoIsoffline(@RequestBody HuzhouPlaninfo planinfo){
public Result<String> setPlaninfoIsoffline(@RequestBody List<HuzhouPlaninfo> planinfo){
planinfoService.setPlaninfoIsoffline(planinfo);
return Result.ok();
}

3
huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouProjectController.java

@ -31,6 +31,7 @@ public class HuzhouProjectController {
@Autowired
private IHuzhouUserprojectService userprojectService;
/**
* 新增项目入库
* @param info 项目信息
@ -336,7 +337,7 @@ public class HuzhouProjectController {
return Result.ok(result);
}
@GetMapping("/import")
public Result<?> tryImport(@RequestParam("file")MultipartFile file) throws Exception {
public Result<?> tryImport( MultipartFile file) throws Exception {
projectinfoService.updateTypeByImportFile(file);
return Result.ok("更新成功");
}//测试的时候Body选择form-data,key写file,value选择需要导入的文件

48
huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/WorkflowController.java

@ -25,6 +25,9 @@ import com.easy.admin.modules.huzhou.entity.HuzhouProcessinfo;
import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo;
import com.easy.admin.modules.huzhou.entity.WorkflowBaseInfo;
import com.easy.admin.modules.huzhou.service.IWorkflowService;
import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV;
import com.easy.admin.modules.huzhou.vo.SuperLeaderApprovalDetailsOV;
import com.easy.admin.modules.huzhou.vo.UrtsituationOV;
import com.easy.admin.modules.huzhou.vo.WorkflowActionParamOV;
import com.easy.admin.util.ShiroUtil;
import com.easy.admin.common.api.vo.Result;
@ -147,7 +150,7 @@ public class WorkflowController {
// List<Object> collect = taskImpls.stream().map(TaskEntityImpl::getPersistentState).collect(Collectors.toList());
int taskCount = taskService.createTaskQuery()
.taskCandidateOrAssigned(userId)
.taskAssignee(userId)
.list()
.size();
Page<HashMap<String, Object>> taskPage = new Page<>();
@ -164,11 +167,11 @@ public class WorkflowController {
SysUser currentUser = ShiroUtil.getCurrentUser();
String userId = currentUser.getId();
ArrayList<HashMap<String, String>> resList = new ArrayList<>();
List<HistoricTaskInstance> historicTaskInstances = historyService.createHistoricTaskInstanceQuery()
.taskAssignee(userId)
.orderByTaskCreateTime()
.desc()
.listPage((pageNo-1)*pageSize, pageSize);
// List<HistoricTaskInstance> historicTaskInstances = historyService.createHistoricTaskInstanceQuery()
// .taskAssignee(userId)
// .orderByTaskCreateTime()
// .desc()
// .listPage((pageNo-1)*pageSize, pageSize);
Page<Map<String, String>> mapPage = new Page<>(pageNo,pageSize);
Page<Map<String, String>> completeTaskByAssignee = workflowMapper.getCompleteTaskByAssignee(mapPage, userId);
List<Map<String, String>> records = completeTaskByAssignee.getRecords();
@ -307,14 +310,15 @@ public class WorkflowController {
resList.add(reshashMap);
}
int taskCount = historyService.createHistoricTaskInstanceQuery()
.taskAssignee(userId)
.list()
.size();
// int taskCount = historyService.createHistoricTaskInstanceQuery()
// .taskAssignee(userId)
// .list()
// .size();
List<Map<String, String>> completeTaskByAssigneeList = workflowMapper.getCompleteTaskByAssignee( userId);
Page<HashMap<String, String>> taskPage = new Page<>();
taskPage.setCurrent(pageNo);
taskPage.setSize(pageSize);
taskPage.setTotal(taskCount);
taskPage.setTotal(completeTaskByAssigneeList.size());
taskPage.setRecords(resList);
return Result.ok(taskPage);
}
@ -359,4 +363,26 @@ public class WorkflowController {
activitiTask.setStatus(status);
return workflowService.select(activitiTask, page);
}
@GetMapping("/getURTProcessPage")
public Result<Page<UrtsituationOV>> getURTProcessPage(HuzhouProjectinfoOV projectinfo,
@RequestParam(name="current", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize){
Page<UrtsituationOV> page = workflowService.getURTProcessPage(projectinfo,pageNo,pageSize);
return Result.OK(page);
}
@GetMapping("/getSuperLeaderApproveInfo")
public Result<Page<SuperLeaderApprovalDetailsOV>> getSuperLeaderApproveInfo(SuperLeaderApprovalDetailsOV superLeaderApproveInfo,
@RequestParam(name="current", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize){
Page<SuperLeaderApprovalDetailsOV> page = workflowService.getSuperLeaderApproveInfo(superLeaderApproveInfo,pageNo,pageSize);
return Result.OK(page);
}
@GetMapping("/getURTUnApprovedDaysPage")
public Result<Page<SuperLeaderApprovalDetailsOV>> getURTUnApprovedDaysPage(SuperLeaderApprovalDetailsOV superLeaderApproveInfo,
@RequestParam(name="current", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize){
Page<SuperLeaderApprovalDetailsOV> page = workflowService.getURTUnApprovedDaysPage(superLeaderApproveInfo,pageNo,pageSize);
return Result.OK(page);
}
}

8
huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/WorkflowMapper.java

@ -2,15 +2,18 @@ package com.easy.admin.modules.huzhou.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.easy.admin.modules.huzhou.vo.SuperLeaderApprovalDetailsOV;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.easy.admin.modules.huzhou.entity.WorkflowBaseInfo;
import java.util.List;
import java.util.Map;
public interface WorkflowMapper extends BaseMapper<Object> {
Page<Map<String,String>> getCompleteTaskByAssignee(Page page, @Param("userid") String id);
List<Map<String,String>> getCompleteTaskByAssignee(@Param("userid") String id);
/**
* 获取与流程配对的信息
@ -18,4 +21,9 @@ public interface WorkflowMapper extends BaseMapper<Object> {
* @return
*/
WorkflowBaseInfo getProjectInfo(String projectId);
Page<SuperLeaderApprovalDetailsOV> getSuperLeaderInfoAndReformInfo(Page page);
List<Integer> getUnApprovedDays(@Param("superLeader") String superLeader, @Param("reform") String reform);
Page<SuperLeaderApprovalDetailsOV> getURTDepInfo(Page page);
List<Integer> getURTUnApprovedDays(@Param("urtDep") String urtDep);
}

77
huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml

@ -11,6 +11,7 @@
WHERE
RES.ASSIGNEE_ = #{userid}
AND RES.END_TIME_ IS NOT NULL
AND ( RES.DELETE_REASON_ IS NULL OR RES.DELETE_REASON_ = 'completed' )
ORDER BY res.START_TIME_ DESC
) a
</select>
@ -29,4 +30,80 @@
union all
SELECT project_Name,reform_name,create_date,stage FROM `huzhou_projectinfo` WHERE id = (select DISTINCT projectid from huzhou_fieldchangehistory where group_id = #{projectId})
</select>
<!-- 任务牵头处室与所属改革项目分组,分组后用任务牵头处室去查询字典的值,用字典的值查角色id,然后用角色id查询用户
原sql:
-->
<select id="getSuperLeaderInfoAndReformInfo" resultType="com.easy.admin.modules.huzhou.vo.SuperLeaderApprovalDetailsOV">
SELECT
super_leader,
reform_name,
-- COUNT( reform_name ),
-- GROUP_CONCAT( id ),
(SELECT su.nickname FROM sys_user su where su.id =
(SELECT sur.user_id from sys_role sr INNER JOIN sys_user_role sur on sr.id = sur.role_id where sr.code =
(SELECT DISTINCT sd.name from sys_dict sd where sd.dict_type="superLeader" and sd.code =super_leader ))) as nickname,
(SELECT su.phone_number FROM sys_user su where su.id =
(SELECT sur.user_id from sys_role sr INNER JOIN sys_user_role sur on sr.id = sur.role_id where sr.code =
(SELECT DISTINCT sd.name from sys_dict sd where sd.dict_type="superLeader" and sd.code =super_leader ))) as phone
FROM
huzhou_projectinfo
GROUP BY
super_leader,
reform_name
</select>
<select id="getUnApprovedDays" resultType="Integer">
SELECT
DATEDIFF(CURDATE(), t.create_time_) AS days_diff
FROM
ACT_RU_EXECUTION a
JOIN
ACT_RU_TASK t ON a.id_ = t.execution_id_
WHERE
a.PROC_INST_ID_ in(
SELECT hps.processInstanceId from huzhou_processinfo hps WHERE projectId in(
SELECT id from huzhou_planinfo hl where hl.project_id in (SELECT id from huzhou_projectinfo where super_leader=#{superLeader} and reform_name=#{reform}) and hl.isfinish != 2
) or projectId in (SELECT id from huzhou_projectinfo where super_leader=#{superLeader} and reform_name=#{reform})
)
and t.name_='任务牵头处室'
</select>
<select id="getURTDepInfo" resultType="com.easy.admin.modules.huzhou.vo.SuperLeaderApprovalDetailsOV">
SELECT
'市卫生健康委' AS urtDep, -- 这里提供手动添加的角色名
'姚丽娟' AS nickname, -- 这里提供手动添加的昵称
'13857268095' AS phone -- 这里提供手动添加的电话
union all
SELECT
sr.name as urtDep,
su.nickname,
su.phone_number AS phone
FROM
sys_role sr
LEFT JOIN
sys_user_role sur ON sr.id = sur.role_id
LEFT JOIN
sys_user su ON sur.user_id = su.id
WHERE
sr.code IN (
"manageOrg",
"市财政局",
"市发展改革委",
"市数据局",
"市委网信办",
"市密码管理局",
"市公安局"
)
</select>
<select id="getURTUnApprovedDays" resultType="Integer">
SELECT
DATEDIFF(CURDATE(), max(t.create_time_)) AS days_diff
FROM
ACT_RU_EXECUTION a
JOIN
ACT_RU_TASK t ON a.id_ = t.execution_id_
WHERE
t.name_=#{urtDep}
GROUP BY t.proc_inst_id_
</select>
</mapper>

2
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java

@ -111,5 +111,5 @@ public interface IHuzhouPlaninfoService extends IService<HuzhouPlaninfo> {
ArrayList<HuzhouPlaninfoOV> queryPlanInfoMainTimelineOffline(String projectid);
void setPlaninfoIsoffline(HuzhouPlaninfo planinfoid);
void setPlaninfoIsoffline( List<HuzhouPlaninfo> planinfoid);
}

9
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IWorkflowService.java

@ -5,6 +5,9 @@ import com.easy.admin.activiti.model.ActivitiTask;
import com.easy.admin.common.core.common.pagination.Page;
import com.easy.admin.modules.huzhou.entity.WorkFlow;
import com.easy.admin.modules.huzhou.entity.WorkflowBaseInfo;
import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV;
import com.easy.admin.modules.huzhou.vo.SuperLeaderApprovalDetailsOV;
import com.easy.admin.modules.huzhou.vo.UrtsituationOV;
import com.easy.admin.modules.huzhou.vo.WorkflowActionParamOV;
import java.util.ArrayList;
@ -46,4 +49,10 @@ public interface IWorkflowService {
Page<ActivitiTask> select(ActivitiTask activitiTask, Page<ActivitiTask> page);
List<HashMap<String, Object>> getprocessInfo(String processInstanceId, String projectid, String stage);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<UrtsituationOV> getURTProcessPage(HuzhouProjectinfoOV projectinfo, Integer pageNo, Integer pageSize);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<SuperLeaderApprovalDetailsOV> getSuperLeaderApproveInfo(SuperLeaderApprovalDetailsOV superLeaderApproveInfo, Integer pageNo, Integer pageSize);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<SuperLeaderApprovalDetailsOV> getURTUnApprovedDaysPage(SuperLeaderApprovalDetailsOV superLeaderApproveInfo, Integer pageNo, Integer pageSize);
}

9
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java

@ -609,7 +609,8 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
@Override
public IPage<HuzhouProjectinfoOV> projectPlanPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize, String newStage) {
// runtimeService.deleteProcessInstance("383306","停止流程");
// runtimeService.deleteProcessInstance("400001","停止流程");
IPage<HuzhouProjectinfoOV> infoPageList = projectinfoService.getProjectInfoAndChildPageList(projectinfo, pageNo, pageSize,newStage);
return infoPageList;
}
@ -1086,7 +1087,9 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
}
@Override
public void setPlaninfoIsoffline(HuzhouPlaninfo planinfo) {
planinfoMapper.updateById(planinfo);
public void setPlaninfoIsoffline( List<HuzhouPlaninfo> planinfo) {
for (HuzhouPlaninfo info:planinfo) {
this.updateById(info);
}
}
}

3
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@ -21,8 +21,7 @@ import com.easy.admin.modules.huzhou.service.*;
import com.easy.admin.modules.huzhou.vo.*;
import com.easy.admin.sys.model.SysDict;
import com.easy.admin.sys.service.SysDictService;
import groovy.util.logging.Slf4j;
import kotlin.collections.EmptyList;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
import org.activiti.engine.runtime.ProcessInstance;

8
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java

@ -21,6 +21,7 @@ import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
import org.activiti.engine.identity.User;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Comment;
import org.activiti.engine.task.IdentityLink;
import org.activiti.engine.task.Task;
import org.activiti.engine.task.TaskQuery;
@ -359,7 +360,12 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl<HuzhouUploadfil
String id = task.getId();
taskService.claim(id, tongyi);
taskService.setVariableLocal(id, "approvalStatue", "1");//添加审批状态 通过
String comment1 = "同意";
List<Comment> taskComments = taskService.getTaskComments(id);
String approvalSuggestion ="同意";
if (taskComments != null && !taskComments.isEmpty()) {
approvalSuggestion = taskComments.get(0).getFullMessage();
}
String comment1 = approvalSuggestion;
taskService.addComment(id, task.getProcessInstanceId(), comment1);//添加审批意见
taskService.complete(id);
}

136
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java

@ -25,12 +25,15 @@ import com.easy.admin.common.api.vo.Result;
import com.easy.admin.common.core.common.pagination.Page;
import com.easy.admin.common.core.common.select.Select;
import com.easy.admin.common.core.util.ToolUtil;
import com.easy.admin.common.util.CommonUtils;
import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfoMapper;
import com.easy.admin.modules.huzhou.dao.HuzhouProcessinfoMapper;
import com.easy.admin.modules.huzhou.dao.HuzhouProjectinfoMapper;
import com.easy.admin.modules.huzhou.dao.WorkflowMapper;
import com.easy.admin.modules.huzhou.entity.*;
import com.easy.admin.modules.huzhou.service.IHuzhouProcessinfoService;
import com.easy.admin.modules.huzhou.vo.WorkflowActionParamOV;
import com.easy.admin.modules.huzhou.vo.*;
import com.easy.admin.util.ShiroUtil;
import com.easy.admin.modules.huzhou.service.IWorkflowService;
@ -74,7 +77,11 @@ public class WorkflowServiceImpl implements IWorkflowService {
@Autowired
private ActivitiProcessDefinitionService activitiProcessDefinitionService;
@Autowired
private ActivitiTaskService activitiTaskService;
private HuzhouProjectinfoMapper projectinfoMapper;
@Autowired
private HuzhouProcessinfoMapper processinfoMapper;
@Autowired
private HuzhouPlaninfoMapper planinfoMapper;
@Autowired
private TaskService taskService;
@Autowired
@ -264,6 +271,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
select2.setLabel("作废");
select2.setValue("3");
actionButtons.add(select2);
workflowActionParamOV.setIsEdit(true);
}else{
Select select1 = new Select();
select1.setLabel("同意");
@ -271,11 +279,11 @@ public class WorkflowServiceImpl implements IWorkflowService {
actionButtons.add(select1);
workflowActionParamOV.setIsEdit(true);
}
Select select1 = new Select();
select1.setLabel("同意");
select1.setValue("1");
actionButtons.add(select1);
workflowActionParamOV.setIsEdit(true);
// Select select1 = new Select();
// select1.setLabel("同意");
// select1.setValue("1");
// actionButtons.add(select1);
// workflowActionParamOV.setIsEdit(true);
} else if ("总咨询单位".equals(name)&&(task.getProcessDefinitionId().contains("feasibilityTechReviewConfirm")||task.getProcessDefinitionId().contains("costEvalReportConfirm"))) {
Select select1 = new Select();
select1.setLabel("同意");
@ -732,4 +740,118 @@ public class WorkflowServiceImpl implements IWorkflowService {
// }
return sortedList;
}
@Override
public com.baomidou.mybatisplus.extension.plugins.pagination.Page<UrtsituationOV> getURTProcessPage(HuzhouProjectinfoOV projectInfo, Integer pageNo, Integer pageSize) {
//根据项目找到计划,找到计划的联合技术审查,项目可能没有计划就是空
// 联合技术审查id 找到流程processInstanceId,可能为空
//processInstanceId 找流程审批意见
ArrayList<UrtsituationOV> arrayList = new ArrayList<>();
com.baomidou.mybatisplus.extension.plugins.pagination.Page page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo, pageSize);
projectInfo.setStage("0");
ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<HuzhouProjectinfoOV> projectAndChildInfoPageList = projectinfoMapper.getProjectAndChildInfoPageList(page, projectInfoAuthSelect);
for (HuzhouProjectinfoOV item :
projectAndChildInfoPageList.getRecords()) {
UrtsituationOV urtsituationOV = new UrtsituationOV();
String id = item.getId();
LambdaQueryWrapper<HuzhouPlaninfo> huzhouPlaninfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
huzhouPlaninfoLambdaQueryWrapper.eq(HuzhouPlaninfo::getProjectId, id);
huzhouPlaninfoLambdaQueryWrapper.eq(HuzhouPlaninfo::getTaskName, "联合技术审查");
List<HuzhouPlaninfo> huzhouPlaninfos = planinfoMapper.selectList(huzhouPlaninfoLambdaQueryWrapper);
if (huzhouPlaninfos.size() ==1) {
String planId = huzhouPlaninfos.get(0).getId();
LambdaQueryWrapper<HuzhouProcessinfo> processinfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
processinfoLambdaQueryWrapper.eq(HuzhouProcessinfo::getProjectid, planId);
processinfoLambdaQueryWrapper.ne(HuzhouProcessinfo::getProcessstatus, "0");
List<HuzhouProcessinfo> huzhouProcessinfos = processinfoMapper.selectList(processinfoLambdaQueryWrapper);
if (huzhouProcessinfos.size() == 1) {
String processInstanceId = huzhouProcessinfos.get(0).getProcessinstanceid();
List<HistoricTaskInstance> history = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(processInstanceId).orderByHistoricTaskInstanceEndTime().asc()
.list();
HashMap<String, String> hashMap = new HashMap<>();
for (HistoricTaskInstance activityInstance :
history) {
String approvalSuggestion="";
List<Comment> taskComments = taskService.getTaskComments(activityInstance.getId());
if (taskComments != null && !taskComments.isEmpty()) {
approvalSuggestion = taskComments.get(0).getFullMessage();
}
hashMap.put(activityInstance.getName(), approvalSuggestion);
}
urtsituationOV.setProjectName(item.getProjectName());
urtsituationOV.setSczj(hashMap.get("市财政局"));
urtsituationOV.setSfzgw(hashMap.get("市发展改革委"));
urtsituationOV.setSgaj(hashMap.get("市公安局"));
urtsituationOV.setSmmglj(hashMap.get("市密码管理局"));
urtsituationOV.setSsjj(hashMap.get("市数据局"));
urtsituationOV.setShwjk(hashMap.get("市卫生健康委"));
urtsituationOV.setSwxb(hashMap.get("市委网信办"));
urtsituationOV.setTaskName("联合技术审查");
urtsituationOV.setIsfinish(huzhouPlaninfos.get(0).getIsfinish());
urtsituationOV.setId(id);
urtsituationOV.setPlaninfoid(planId);
}else{
urtsituationOV.setProjectName(item.getProjectName());
}
}else {
urtsituationOV.setProjectName(item.getProjectName());
}
arrayList.add(urtsituationOV);
}
com.baomidou.mybatisplus.extension.plugins.pagination.Page<UrtsituationOV> taskPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>();
taskPage.setCurrent(pageNo);
taskPage.setSize(pageSize);
taskPage.setTotal(projectAndChildInfoPageList.getTotal());
taskPage.setRecords(arrayList);
return taskPage;
}
@Override
public com.baomidou.mybatisplus.extension.plugins.pagination.Page<SuperLeaderApprovalDetailsOV> getSuperLeaderApproveInfo(SuperLeaderApprovalDetailsOV superLeaderApproveInfo, Integer pageNo, Integer pageSize) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo, pageSize);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<SuperLeaderApprovalDetailsOV> info = workflowMapper.getSuperLeaderInfoAndReformInfo(page);
info.getRecords().forEach(item -> {
List<Integer> unApprovedDays = workflowMapper.getUnApprovedDays(item.getSuperLeader(), item.getReformName());
if(unApprovedDays!=null&&unApprovedDays.size()>0){
item.setUnapprovedCount(unApprovedDays.stream().filter(count -> count==0).count());
item.setUnapprovedCount2d(unApprovedDays.stream().filter(count -> count==2).count());
item.setUnapprovedCount3d(unApprovedDays.stream().filter(count -> count==3).count());
item.setUnapprovedCount5d(unApprovedDays.stream().filter(count -> count==5).count());
item.setUnapprovedCountOver5d(unApprovedDays.stream().filter(count -> count>5).count());
}else{
item.setUnapprovedCount(0L);
item.setUnapprovedCount2d(0L);
item.setUnapprovedCount3d(0L);
item.setUnapprovedCount5d(0L);
item.setUnapprovedCountOver5d(0L);
}
});
return info;
}
@Override
public com.baomidou.mybatisplus.extension.plugins.pagination.Page<SuperLeaderApprovalDetailsOV> getURTUnApprovedDaysPage(SuperLeaderApprovalDetailsOV superLeaderApproveInfo, Integer pageNo, Integer pageSize) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo, pageSize);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<SuperLeaderApprovalDetailsOV> urtDepInfo = workflowMapper.getURTDepInfo(page);
urtDepInfo.getRecords().forEach(item -> {
List<Integer> unApprovedDays = workflowMapper.getURTUnApprovedDays(item.getUrtDep().replace("负责人",""));
if(unApprovedDays!=null&&unApprovedDays.size()>0){
item.setUnapprovedCount(unApprovedDays.stream().filter(count -> count==0).count());
item.setUnapprovedCount2d(unApprovedDays.stream().filter(count -> count==2).count());
item.setUnapprovedCount3d(unApprovedDays.stream().filter(count -> count==3).count());
item.setUnapprovedCount5d(unApprovedDays.stream().filter(count -> count==5).count());
item.setUnapprovedCountOver5d(unApprovedDays.stream().filter(count -> count>5).count());
}else{
item.setUnapprovedCount(0L);
item.setUnapprovedCount2d(0L);
item.setUnapprovedCount3d(0L);
item.setUnapprovedCount5d(0L);
item.setUnapprovedCountOver5d(0L);
}
});
return urtDepInfo;
}
}

38
huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/SuperLeaderApprovalDetailsOV.java

@ -0,0 +1,38 @@
package com.easy.admin.modules.huzhou.vo;
import lombok.Data;
@Data
public class SuperLeaderApprovalDetailsOV {
// 上级指导处室,假设这是一个字符串类型,实际可能需要根据具体业务逻辑调整
private String superLeader;
// 改革所属项目,同样假设为字符串类型
private String reformName;
// 处理人昵称
private String nickname;
// 手机号
private String phone;
// 未审批流程数
private Long unapprovedCount;
// 2天未审批流程数
private Long unapprovedCount2d;
// 3天未审批流程数
private Long unapprovedCount3d;
// 5天未审批流程数
private Long unapprovedCount5d;
// 超过5天未审批流程数
private Long unapprovedCountOver5d;
private String reformCount;
private String idList;
private String urtDep;
}

21
huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/UrtsituationOV.java

@ -0,0 +1,21 @@
package com.easy.admin.modules.huzhou.vo;
import lombok.Data;
//联合技术审批情况
@Data
public class UrtsituationOV {
private String projectName; // 项目名称
private String shwjk; // 市卫生健康委
private String sczj; // 市财政局
private String sfzgw; // 市发展改革委
private String ssjj; // 市数据局
private String swxb; // 市委网信办
private String smmglj; // 市密码管理局
private String sgaj; // 市公安局
private String id; // 主键ID
private String isfinish; // 是否完成
private String taskName; // 任务名称
private String planinfoid; // 计划ID
}
Loading…
Cancel
Save