From 46fd62caf162ea472c281997433ccfef680cf2e1 Mon Sep 17 00:00:00 2001 From: zhouhaibin Date: Fri, 19 Apr 2024 09:15:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActivitiProcessDefinitionService.java | 4 +- .../ActivitiProcessDefinitionServiceImpl.java | 22 +- .../HuzhouChangefieldmanageController.java | 24 + .../HuzhouFieldchangehistoryController.java | 64 ++- .../controller/HuzhouPlanController.java | 14 +- .../HuzhouPlaninfofileController.java | 108 +---- .../HuzhouRegulationlabController.java | 43 ++ .../HuzhouSubProjectinfoController.java | 6 + .../huzhou/controller/WorkflowController.java | 51 +- .../huzhou/dao/HuzhouContractinfoMapper.java | 5 +- .../dao/mapping/HuzhouContractinfoMapper.xml | 437 +++++++++++++++--- .../huzhou/dao/mapping/WorkflowMapper.xml | 4 + .../huzhou/entity/HuzhouContractinfo.java | 2 +- .../entity/HuzhouFieldchangehistory.java | 1 + .../admin/modules/huzhou/entity/WorkFlow.java | 2 + .../IHuzhouFieldchangehistoryService.java | 8 +- .../service/IHuzhouPlaninfoService.java | 27 +- .../service/IHuzhouPlaninfofileService.java | 7 + .../impl/HuzhouContractinfoServiceImpl.java | 117 +---- .../HuzhouFieldchangehistoryServiceImpl.java | 272 ++++++++--- .../impl/HuzhouPlaninfoServiceImpl.java | 89 +++- .../impl/HuzhouPlaninfofileServiceImpl.java | 244 +++++++++- .../impl/HuzhouProjectinfoServiceImpl.java | 61 ++- .../impl/HuzhouSubProjectinfoServiceImpl.java | 48 +- .../service/impl/WorkflowServiceImpl.java | 6 +- .../huzhou/vo/HuzhouProjectinfoOV.java | 6 - 26 files changed, 1266 insertions(+), 406 deletions(-) diff --git a/easy-activiti/src/main/java/com/easy/admin/activiti/service/ActivitiProcessDefinitionService.java b/easy-activiti/src/main/java/com/easy/admin/activiti/service/ActivitiProcessDefinitionService.java index fe6da13..7da837c 100644 --- a/easy-activiti/src/main/java/com/easy/admin/activiti/service/ActivitiProcessDefinitionService.java +++ b/easy-activiti/src/main/java/com/easy/admin/activiti/service/ActivitiProcessDefinitionService.java @@ -4,6 +4,8 @@ import cn.hutool.json.JSONObject; import com.easy.admin.activiti.model.ActivitiProcessDefinitionVO; import org.activiti.engine.repository.ProcessDefinition; +import java.util.HashMap; + /** * 启动流程 * @@ -27,7 +29,7 @@ public interface ActivitiProcessDefinitionService { * @return 实例ID或动态表单url */ JSONObject startProcessInstance(ActivitiProcessDefinitionVO activitiProcessDefinitionVO); - JSONObject startProcessInstanceHuzhou(ActivitiProcessDefinitionVO activitiProcessDefinitionVO); + HashMap startProcessInstanceHuzhou(ActivitiProcessDefinitionVO activitiProcessDefinitionVO); /** * 检查任务是否满足自动签收条件 diff --git a/easy-activiti/src/main/java/com/easy/admin/activiti/service/impl/ActivitiProcessDefinitionServiceImpl.java b/easy-activiti/src/main/java/com/easy/admin/activiti/service/impl/ActivitiProcessDefinitionServiceImpl.java index 1963259..a9aa2da 100644 --- a/easy-activiti/src/main/java/com/easy/admin/activiti/service/impl/ActivitiProcessDefinitionServiceImpl.java +++ b/easy-activiti/src/main/java/com/easy/admin/activiti/service/impl/ActivitiProcessDefinitionServiceImpl.java @@ -16,6 +16,10 @@ import com.easy.admin.auth.model.SysRole; import com.easy.admin.auth.model.SysUser; import com.easy.admin.auth.service.SysRoleService; import com.easy.admin.util.ShiroUtil; +import org.activiti.bpmn.model.BpmnModel; +import org.activiti.bpmn.model.FlowElement; +import org.activiti.bpmn.model.SequenceFlow; +import org.activiti.bpmn.model.UserTask; import org.activiti.engine.FormService; import org.activiti.engine.IdentityService; import org.activiti.engine.RepositoryService; @@ -122,12 +126,12 @@ public class ActivitiProcessDefinitionServiceImpl extends ServiceImpl startProcessInstanceHuzhou(ActivitiProcessDefinitionVO activitiProcessDefinitionVO) { if (checkBusinessKey(activitiProcessDefinitionVO.getBusinessKey())) { throw new EasyException("[" + activitiProcessDefinitionVO.getBusinessKey() + "]已提交过申请，请勿重复提交"); } SysUser currentUser = ShiroUtil.getCurrentUser(); - JSONObject result = new JSONObject(); + HashMap result = new HashMap<>(); ProcessDefinition processDefinition = getProcessDefinition(activitiProcessDefinitionVO.getProcessDefinitionId()); if (activitiProcessDefinitionVO.getHasFormData() == null || !activitiProcessDefinitionVO.getHasFormData()) { StartFormData startFormData = formService.getStartFormData(activitiProcessDefinitionVO.getProcessDefinitionId()); @@ -137,8 +141,8 @@ public class ActivitiProcessDefinitionServiceImpl extends ServiceImpl changeFieldManagePageList(HuzhouChangefieldmanage changefieldmanage, @RequestParam(name="current", defaultValue="1") Integer pageNo, @@ -28,15 +36,31 @@ public class HuzhouChangefieldmanageController { Page huzhouChangefieldmanagePage = changefieldmanageService.changeFieldManagePageList(changefieldmanage, pageNo, pageSize); return huzhouChangefieldmanagePage; } + + /** + * 根据id获取可变更字段内容 + * @param changefieldmanage + * @return + */ @GetMapping("/getchangeFieldManageById") public HuzhouChangefieldmanage getchangeFieldManageById(HuzhouChangefieldmanage changefieldmanage){ String id = changefieldmanage.getId(); return changefieldmanageService.getById(id); } + + /** + * 修改可变更字段 + * @param changefieldmanage + */ @PostMapping("/modifychangeFieldManageById") public void modifychangeFieldManageById(@RequestBody HuzhouChangefieldmanage changefieldmanage){ changefieldmanageService.updateById(changefieldmanage); } + + /** + * 获取可变更字段字典 + * @return + */ @GetMapping("/getChangeFieldManageDict") public List> getChangeFieldManageDict(){ return changefieldmanageService.getChangeFieldManageDict(); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouFieldchangehistoryController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouFieldchangehistoryController.java index af581ac..201b6ff 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouFieldchangehistoryController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouFieldchangehistoryController.java @@ -28,18 +28,39 @@ public class HuzhouFieldchangehistoryController { private IWorkflowService workflowService; @Autowired private IHuzhouUploadfileinfoService uploadfileinfoService; + + /** + * 提交字段变更申请(单个字段) + * @param multipartFiles + * @param fieldValue + * @throws Exception + */ @PostMapping("/submitFieldchange") public void submitFieldchange(@RequestParam(value = "file",required = false) MultipartFile[] multipartFiles, - String projectid,String fieldValue,String newValue) throws IOException { - - fieldchangehistoryService.submitChangeFieldManage(multipartFiles,projectid,fieldValue,newValue); + String fieldValue,HuzhouProjectinfo projectinfo) throws Exception { + String projectid = projectinfo.getId(); + fieldchangehistoryService.submitChangeFieldManage(multipartFiles,projectid,fieldValue,projectinfo); } - @GetMapping("/getFieldchangeByid") - public HuzhouFieldchangehistory getFieldchangeByid(String fieldChangeid) throws IOException { - HuzhouFieldchangehistory fieldchangehistory = fieldchangehistoryService.getById(fieldChangeid); + /** + * 根据Groupid 获取修改的字段组合 + * @param fieldChangeGroupid + * @return + * @throws IOException + */ + @GetMapping("/getFieldchangeByGroupid") + public List getFieldchangeByGroupid(String fieldChangeGroupid) throws IOException { + + List fieldchangehistory = fieldchangehistoryService.getFieldchangeByGroupid(fieldChangeGroupid); return fieldchangehistory; } + + /** + * 根据项目id获取变更字段列表 + * @param projectid + * @return + * @throws IOException + */ @GetMapping("/getFieldchangeListByprojectid") public List getFieldchangeListByprojectid(String projectid) throws IOException { @@ -47,25 +68,36 @@ public class HuzhouFieldchangehistoryController { } @GetMapping("/getFieldchangeFileinfoList") - public List getFieldchangeFileinfoList(String fieldChangeid){ - List fieldchangeFileinfoList = fieldchangehistoryService.getFieldchangeFileinfoList(fieldChangeid); + public List getFieldchangeFileinfoList(String fieldChangeGroupid){ + List fieldchangeFileinfoList = fieldchangehistoryService.getFieldchangeFileinfoList(fieldChangeGroupid); return fieldchangeFileinfoList; } + + /** + * 审批项目字段变更 + * @param file + * @param taskId + * @param flag + * @param fieldChangeGroupid + * @param comment + * @param isEdit + * @param newProjectinfo 所有变革项目字段的信息 + * @throws Exception + */ @PostMapping("/approvalFieldchange") public void approvalFieldchange(@RequestParam(value = "file",required = false) MultipartFile[] file, - @RequestParam String taskId, - @RequestParam String flag, - @RequestParam String fieldChangeid, - @RequestParam String comment, - @RequestParam String isEdit, - @RequestParam String newvalue) throws IOException { - fieldchangehistoryService.approvalFieldchange(file,taskId,flag,fieldChangeid,comment,isEdit,newvalue); + String taskId, + String flag, + String fieldChangeGroupid, + String comment, + String isEdit, + HuzhouProjectinfo newProjectinfo) throws Exception { + fieldchangehistoryService.approvalFieldchange(file,taskId,flag,fieldChangeGroupid,comment,isEdit,newProjectinfo); } @GetMapping("/getFieldchangehistoryPageList") public Page getFieldchangehistoryPageList(HuzhouProjectinfo projectinfo, @RequestParam(name="current", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize){ Page page =new Page<>(pageNo,pageSize); - Page fieldchangehistoryPageList = fieldchangehistoryService.getFieldchangehistoryPageList(page, projectinfo); return fieldchangehistoryPageList; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java index 95a3654..94b5b96 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouPlanController.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.easy.admin.auth.model.SysUser; +import com.easy.admin.common.core.common.select.Select; import com.easy.admin.common.core.exception.EasyException; import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; import com.easy.admin.util.ShiroUtil; @@ -43,7 +44,7 @@ public class HuzhouPlanController { private IHuzhouPlaninfoService planinfoService; /** - * 项目计划列表信息 + * 项目计划列表信息分页 * @param projectinfo 查询条件 * @param pageNo 页码 * @param pageSize 每页条数 @@ -164,4 +165,15 @@ public class HuzhouPlanController { planinfoService.downloadPlanInfo(response,projectid); } + + /** + * 根据项目id获取项目阶段名称字典 + * @param projectid + * @return + */ + @GetMapping("/getTaskNameTypeDict") + public Result getTaskNameTypeDict(String projectid){ + List - SELECT * from huzhou_projectinfo u - - and u.id not in (select distinct project_id from huzhou_contractinfo where status ='1') - and NOT EXISTS ( - SELECT 1 - FROM huzhou_sub_projectinfo sub - left JOIN ( select cc.project_id,ss.project_id zhuprojectid,cc.task_name,cc.status,ss.stage from huzhou_contractinfo cc INNER JOIN huzhou_sub_projectinfo ss on cc.project_id=ss.id) c ON sub.id = c.project_id - WHERE sub.project_id = u.id and (c.status = '1' or c.status is null) and sub.stage>=5 - HAVING COUNT(DISTINCT c.project_id) = COUNT(DISTINCT sub.id) AND COUNT(DISTINCT sub.id)>0) - - and u.id in( - select project_id from huzhou_userproject where user_id=#{info.projectContacts} - ) - - - and u.id in( - SELECT DISTINCT id from huzhou_projectinfo e where e.admin_division in( - SELECT DISTINCT a.admin_division from huzhou_projectinfo a where a.id in (select c.project_id from - huzhou_userproject c where c.user_id=#{info.supervisorContactor}) - ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - SELECT * from huzhou_projectinfo u @@ -76,7 +171,7 @@ - and u.id in (select distinct project_id from huzhou_contractinfo ct where status ='1' and ct.project_id + and u.id in( SELECT DISTINCT id from huzhou_projectinfo e where e.admin_division in( SELECT DISTINCT a.admin_division from huzhou_projectinfo a where a.id in (select c.project_id from @@ -94,12 +189,37 @@ and u.id in (select distinct project_id from huzhou_contractinfo ct where status ='1') - or EXISTS ( + or ( + EXISTS ( SELECT 1 FROM huzhou_sub_projectinfo sub JOIN huzhou_contractinfo c ON sub.id = c.project_id WHERE sub.project_id = u.id and c.status ='1' HAVING COUNT(DISTINCT c.project_id) >0) + ) + + and u.id in ( + select project_id from huzhou_userproject where user_id=#{info.projectContacts} + ) + + + + and u.id + in( + SELECT DISTINCT id from huzhou_projectinfo e where e.admin_division in( + SELECT DISTINCT a.admin_division from huzhou_projectinfo a where a.id in (select c.project_id from + huzhou_userproject c where c.user_id=#{info.supervisorContactor}) + ) + + OR + e.super_leader in ( + SELECT DISTINCT b.super_leader from huzhou_projectinfo b where b.id in (select d.project_id from + huzhou_userproject d where d.user_id=#{info.supervisorContactor}) + ) + ) + + + and u.project_name like #{tempStr} @@ -130,7 +250,190 @@ and u.stage >= #{info.stage} - - order by create_date desc - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml index dbff2aa..728dca8 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml @@ -24,5 +24,9 @@ ,create_date,null from huzhou_fieldchangehistory f WHERE id = #{projectId} union all SELECT project_Name,create_date,stage FROM `huzhou_sub_projectinfo` WHERE id = #{projectId} + union all + SELECT project_Name,create_date,stage FROM `huzhou_sub_projectinfo` WHERE id = (select DISTINCT projectid from huzhou_fieldchangehistory where group_id = #{projectId}) + union all + SELECT project_Name,create_date,stage FROM `huzhou_projectinfo` WHERE id = (select DISTINCT projectid from huzhou_fieldchangehistory where group_id = #{projectId}) \ No newline at end of file diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouContractinfo.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouContractinfo.java index b8b8eb8..c8ceb34 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouContractinfo.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouContractinfo.java @@ -60,7 +60,7 @@ public class HuzhouContractinfo extends BaseEntity implements Serializable { */ private Double centralMoney; private String status; - + private String groupId; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouFieldchangehistory.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouFieldchangehistory.java index 447cb70..546b548 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouFieldchangehistory.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouFieldchangehistory.java @@ -42,6 +42,7 @@ public class HuzhouFieldchangehistory extends BaseEntity implements Serializable */ private String fileId; private String status; + private String groupId; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/WorkFlow.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/WorkFlow.java index e88d028..402a9c3 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/WorkFlow.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/WorkFlow.java @@ -1,6 +1,7 @@ package com.easy.admin.modules.huzhou.entity; import lombok.Data; +import org.activiti.engine.task.Task; @Data public class WorkFlow { @@ -12,5 +13,6 @@ public class WorkFlow { * 业务表流程key值 */ private String businessKey; + private Task task; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouFieldchangehistoryService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouFieldchangehistoryService.java index 90fe86b..c9d3f19 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouFieldchangehistoryService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouFieldchangehistoryService.java @@ -13,15 +13,15 @@ import java.util.List; import java.util.Map; public interface IHuzhouFieldchangehistoryService extends IService { - void submitChangeFieldManage(MultipartFile[] multipartFiles, String projectid, String fieldValue, String newValue) throws IOException; - List getFieldchangeFileinfoList(String fieldChangeid); + void submitChangeFieldManage(MultipartFile[] multipartFiles, String projectid, String fieldValue, HuzhouProjectinfo projectinfo) throws Exception; + List getFieldchangeFileinfoList(String fieldChangeGroupid); void approvalFieldchange(MultipartFile[] file, String taskId, String flag, String fieldChangeid, String comment, String isEdit, - String newvalue) throws IOException; + HuzhouProjectinfo newProjectinfo) throws Exception; /** * 已经审批通过生效的 @@ -31,4 +31,6 @@ public interface IHuzhouFieldchangehistoryService extends IService getFieldchangeListByprojectid(String projectid); Page getFieldchangehistoryPageList(Page page, HuzhouProjectinfo projectinfo); Page getFieldchangehistoryDetailPageList(Page page, String proid); + + List getFieldchangeByGroupid(String fieldChangeGroupid); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java index 5e758c9..75f150d 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouPlaninfoService.java @@ -3,6 +3,7 @@ package com.easy.admin.modules.huzhou.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.easy.admin.common.core.common.select.Select; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; import org.apache.poi.ss.usermodel.Sheet; @@ -64,14 +65,34 @@ public interface IHuzhouPlaninfoService extends IService { * @return */ Boolean isExitTaskNameInPlanInfo(String projectid,String taskName); - + /** + * 项目计划列表信息分页 + * @param projectinfo 查询条件 + * @param pageNo 页码 + * @param pageSize 每页条数 + * @return 返回值 + */ IPage projectPlanPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize); - + /** + * 上传计划信息（创建审批流程） + * @param multipartFile 模板文件 + * @param projectid 项目id + * @return 返回值 + * @throws Exception + */ void submitPlaninfoUploadFile(MultipartFile multipartFile, String projectid) throws Exception; void approvePlaninfo(MultipartFile file, String taskId, String flag, String projectid, String comment) throws Exception; - + /** + * 修改项目计划 + * @param multipartFile 需要解析的文件 + * @param projectid 项目id + * @return 返回值 + * @throws Exception + */ void modifyPlaninfo(MultipartFile multipartFile, String projectid) throws Exception; void downloadPlanInfo(HttpServletResponse response, String projectid); + + List selectList = new ArrayList<>(); + for (HuzhouPlaninfo planinfo:listByProjectId + ) { + Select select = new Select(); + select.setLabel(planinfo.getTaskName()); + select.setValue(planinfo.getTaskName()); + selectList.add(select); + } + return selectList; + } + + /** + * 递归处理子阶段数据 + * @param planinfoOV + * @return + */ private HuzhouPlaninfoOV setchild(HuzhouPlaninfoOV planinfoOV){ //在流程这的是否可编辑 if("1".equals(planinfoOV.getIsfinish())){ diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java index ff45f08..64c059d 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java @@ -1,17 +1,55 @@ package com.easy.admin.modules.huzhou.service.impl; +import com.alibaba.excel.util.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.easy.admin.auth.service.SysUserService; +import com.easy.admin.common.api.vo.Result; +import com.easy.admin.common.core.exception.EasyException; +import com.easy.admin.modules.huzhou.dao.HuzhouContractinfoMapper; import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfofileMapper; -import com.easy.admin.modules.huzhou.entity.BaseEntity; -import com.easy.admin.modules.huzhou.entity.HuzhouPlaninfofile; -import com.easy.admin.modules.huzhou.service.IHuzhouPlaninfofileService; +import com.easy.admin.modules.huzhou.entity.*; +import com.easy.admin.modules.huzhou.service.*; +import com.easy.admin.sys.model.SysDict; +import com.easy.admin.sys.service.SysDictService; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.TaskService; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.*; @Service +@Transactional public class HuzhouPlaninfofileServiceImpl extends ServiceImpl implements IHuzhouPlaninfofileService { + @Autowired + private IHuzhouPlaninfoService planinfoService; + @Autowired + private IWorkflowService workflowService; + @Autowired + private IHuzhouProcessinfoService processinfoService; + @Autowired + private IHuzhouProjectinfoService projectinfoService; + @Autowired + private RuntimeService runtimeService; + @Autowired + private IHuzhouSubProjectinfoService subProjectinfoService; + @Autowired + private SysUserService userService; + @Autowired + private SysDictService sysDictService; + @Autowired + private TaskService taskService; + @Autowired + private HuzhouContractinfoMapper contractinfoMapper; + private String[] names ={"可行性研究报告审批","初验阶段","终验阶段"}; @Override public Page getplanFilePageList(HuzhouPlaninfofile planinfofile,Integer pageNo, Integer pageSize) { @@ -31,4 +69,204 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl childPlanList = planinfoService.queryChildPlan(planinfo.getProjectId(), planinfo.getTaskLevel(),"0,1"); + if(childPlanList.size()>0){ + throw new EasyException("存在未完成(审批中)的子项。当前阶段不允许提交文件"); + } + planinfoService.saveOrModifyPlanUploadFile(files,planinfoid,"1","1"); + String taskName = planinfo.getTaskName(); + String projectId = planinfoService.getById(planinfoid).getProjectId(); + HuzhouProjectinfo huzhouProjectinfo = projectinfoService.getById(projectId); + String superLeader = ""; + String adminDivision=""; + //如果项目信息为空说明是子项目 + if(huzhouProjectinfo==null){ + HuzhouSubProjectinfo byId = subProjectinfoService.getById(projectId); + superLeader = byId.getSuperLeader(); + adminDivision = byId.getAdminDivision(); + }else { + superLeader=huzhouProjectinfo.getSuperLeader(); + adminDivision = huzhouProjectinfo.getAdminDivision(); + } + //获取上级指导室中文名称 + SysDict dict = sysDictService.getDictByCode("superLeader", superLeader); + String dictName = dict.getName(); + //上级指导室中文名称查询角色有哪些人 + List> userDictByRoles = userService.getUserDictByRoles(dictName); + ArrayList strings = new ArrayList<>(); + if(userDictByRoles==null||userDictByRoles.size()==0){ + String error = "任务牵头处室"+dictName+"负责人未找到"; + throw new EasyException(error); + } + for (HashMap map:userDictByRoles + ) { + String userid = map.get("value"); + strings.add(userid); + } + if ("可研报告编制".equals(taskName)) { + WorkFlow workFlow = workflowService.createFlow("feasibilityReportPreparation",planinfoid); + + Task task = workFlow.getTask(); + String taskId = task.getId(); + String processInstanceId = workFlow.getProcessInstanceId(); + Map variables = new HashMap<>(); + variables.put("taskLeadingDepartment",strings); + runtimeService.setVariable(processInstanceId, "taskLeadingDepartment", strings);//设置第四个人变量信息 + variables.clear(); + //上级指导室中文名称查询角色有哪些人 + userDictByRoles = userService.getUserDictByRoles(adminDivision); + ArrayList strings2 = new ArrayList<>(); + if(userDictByRoles==null||userDictByRoles.size()==0){ + String error = "信息化保障团队"+adminDivision+"负责人未找到"; + throw new EasyException(error); + } + for (HashMap map:userDictByRoles + ) { + String userid = map.get("value"); + strings2.add(userid); + } + variables.put("informationSecurityTeam",strings2);//设置第二个人 + //发起人节点处理 + taskService.setVariableLocal(taskId,"approvalStatue","1");//添加审批状态 通过 + String comment = "同意"; + taskService.addComment(taskId,processInstanceId,comment);//添加审批意见 + taskService.complete(taskId, variables); + return ; + } + //查询当前阶段是否与合同支付相关 + boolean existsContractinfo = false; + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HuzhouContractinfo::getTaskName,taskName); + queryWrapper.eq(HuzhouContractinfo::getProjectId,projectId); + queryWrapper.eq(HuzhouContractinfo::getStatus,"1"); + List contractinfoList = contractinfoMapper.selectList(queryWrapper); + if(contractinfoList!=null&&contractinfoList.size()>0){ + existsContractinfo=true; + } + if(Arrays.asList(names).contains(taskName)||existsContractinfo){ + WorkFlow workFlow = workflowService.createFlow("createPlaninfoFile",planinfoid); + Task task = workFlow.getTask(); + String taskId = task.getId(); + String processInstanceId = workFlow.getProcessInstanceId(); + Map variables = new HashMap<>(); + variables.put("taskLeadingDepartment",strings); + runtimeService.setVariable(processInstanceId, "taskLeadingDepartment", strings);//设置第四个人变量信息 + //发起人节点处理 + taskService.setVariableLocal(taskId,"approvalStatue","1");//添加审批状态 通过 + String comment = "同意"; + taskService.addComment(taskId,processInstanceId,comment);//添加审批意见 + taskService.complete(taskId, variables); + return ; + } + if("联合技术审查".equals(taskName)){ + WorkFlow workFlow = workflowService.createFlow("jointTechnicalReview",planinfoid); + Task task = workFlow.getTask(); + String taskId = task.getId(); + String processInstanceId = workFlow.getProcessInstanceId(); + + //发起人节点处理 + taskService.setVariableLocal(taskId,"approvalStatue","1");//添加审批状态 通过 + String comment = "同意"; + taskService.addComment(taskId,processInstanceId,comment);//添加审批意见 + taskService.complete(taskId); + return ; + } + if("集中核验".equals(taskName)){ + WorkFlow workFlow = workflowService.createFlow("centralizedCheck",planinfoid); + Task task = workFlow.getTask(); + String taskId = task.getId(); + String processInstanceId = workFlow.getProcessInstanceId(); + //发起人节点处理 + taskService.setVariableLocal(taskId,"approvalStatue","1");//添加审批状态 通过 + String comment = "同意"; + taskService.addComment(taskId,processInstanceId,comment);//添加审批意见 + taskService.complete(taskId); + return ; + } + HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo(); + huzhouPlaninfo.setId(planinfoid); + huzhouPlaninfo.setIsfinish("2"); + planinfoService.updateById(huzhouPlaninfo); + + /** + * 检查所有阶段的状态，判断是否完成 + */ + HuzhouPlaninfo planinfoNow = planinfoService.getById(planinfoid); + String pid = planinfo.getProjectId(); + HuzhouPlaninfo nodePlan = planinfoService.getNodePlan(pid, planinfoNow.getSuperior()); + //如果文件为空，检查子项是否全部完成，若以完成则为完成 + if(null!=nodePlan&& StringUtils.isBlank(nodePlan.getTaskFile())){ + List unfinishChildPlan = planinfoService.queryChildPlan(pid, nodePlan.getTaskLevel(), "0,1"); + if(unfinishChildPlan.size()==0){ + HuzhouPlaninfo nodePlaninfo = new HuzhouPlaninfo(); + nodePlaninfo.setIsfinish("2"); + nodePlaninfo.setActualEndTime(new Date()); + nodePlaninfo.setId(nodePlan.getId()); + planinfoService.updateById(nodePlaninfo); + } + } + + List list = planinfoService.getUnFinishListByProjectId(pid); + if(list.size()==0){ + projectinfoService.modifyStageById(pid,"6"); + } + } + + @Override + public void approvePlanFile(MultipartFile[] files, String taskId, String flag, String planinfoid, String comment, MultipartFile[] adviceFiles) throws IOException { + WorkFlow workFlow = workflowService.approveProjectInfo(taskId, flag, comment); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HuzhouProcessinfo::getProjectid,planinfoid); + queryWrapper.eq(HuzhouProcessinfo::getProcessstatus,"1"); + List processinfos = processinfoService.list(queryWrapper); + String processName = processinfos.get(0).getProcessName(); + if(files!=null&&"1".equals(flag)){ + planinfoService.saveOrModifyPlanUploadFile(files,planinfoid,"2","1"); + } + //意见文件 + if(adviceFiles!=null){ + planinfoService.saveOrModifyPlanUploadFile(adviceFiles,planinfoid,"2","2"); + } + HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo(); + huzhouPlaninfo.setId(planinfoid); + + if("3".equals(flag)){ + huzhouPlaninfo.setIsfinish("0"); + planinfoService.updateById(huzhouPlaninfo); + modifyStatusByPlaninfoid("0",planinfoid); + processinfoService.modifyStatusByProjectId(planinfoid,"0",processName); + return ; + } + ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(workFlow.getProcessInstanceId()).singleResult(); + if(processInstance==null&&"1".equals(flag)){ + huzhouPlaninfo.setIsfinish("2"); + planinfoService.updateById(huzhouPlaninfo); + processinfoService.modifyStatusByProjectId(planinfoid,"2",processName); + HuzhouPlaninfo planinfo = planinfoService.getById(planinfoid); + String projectId = planinfo.getProjectId(); + HuzhouPlaninfo nodePlan = planinfoService.getNodePlan(projectId, planinfo.getSuperior()); + //如果文件为空，检查子项是否全部完成，若以完成则为完成 + if(null!=nodePlan&&StringUtils.isBlank(nodePlan.getTaskFile())){ + List unfinishChildPlan = planinfoService.queryChildPlan(projectId, nodePlan.getTaskLevel(), "0,1"); + if(unfinishChildPlan.size()==0){ + HuzhouPlaninfo nodePlaninfo = new HuzhouPlaninfo(); + nodePlaninfo.setIsfinish("2"); + nodePlaninfo.setActualEndTime(new Date()); + nodePlaninfo.setId(nodePlan.getId()); + planinfoService.updateById(nodePlaninfo); + } + } + + List list = planinfoService.getUnFinishListByProjectId(projectId); + if(list.size()==0){ + projectinfoService.modifyStageById(projectId,"6"); + } + } + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index d901530..39a8231 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -6,8 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.easy.admin.activiti.constant.ActivitiVariableConst; import com.easy.admin.auth.model.SysRole; import com.easy.admin.auth.model.SysUser; +import com.easy.admin.auth.model.SysUserRole; +import com.easy.admin.auth.service.SysDeptService; +import com.easy.admin.auth.service.SysRoleService; +import com.easy.admin.auth.service.SysUserRoleService; import com.easy.admin.auth.service.SysUserService; import com.easy.admin.common.core.common.select.Select; import com.easy.admin.common.core.exception.EasyException; @@ -22,10 +27,15 @@ import com.easy.admin.modules.huzhou.entity.*; import com.easy.admin.modules.huzhou.service.*; import com.easy.admin.modules.huzhou.vo.HuzhouProjectinfoOV; import com.easy.admin.modules.huzhou.vo.ProjectApproveOV; +import com.easy.admin.sys.model.SysDict; import com.easy.admin.sys.service.SysDictService; import com.easy.admin.util.ShiroUtil; +import org.activiti.engine.IdentityService; import org.activiti.engine.RuntimeService; +import org.activiti.engine.TaskService; +import org.activiti.engine.impl.identity.Authentication; import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; import com.easy.admin.common.api.vo.Result; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -50,7 +60,7 @@ import java.util.*; import java.util.stream.Collectors; @Service - +@Transactional public class HuzhouProjectinfoServiceImpl extends ServiceImpl implements IHuzhouProjectinfoService { @Autowired @@ -59,6 +69,11 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl variables = new HashMap<>(); + //获取第二节点审批人信息 + String superLeader = info.getSuperLeader();//上级指导室 + //获取上级指导室中文名称 + SysDict dict = sysDictService.getDictByCode("superLeader", superLeader); + String dictName = dict.getName(); + //上级指导室中文名称查询角色有哪些人 + List> userDictByRoles = sysUserService.getUserDictByRoles(dictName); + ArrayList strings = new ArrayList<>(); + if(userDictByRoles==null||userDictByRoles.size()==0){ + String error = "任务牵头处室"+dictName+"负责人未找到"; + throw new EasyException(error); + } + for (HashMap map:userDictByRoles + ) { + String userid = map.get("value"); + strings.add(userid); + } + variables.put("taskLeadingDepartment",strings); + //发起人节点处理 + taskService.setVariableLocal(taskId,"approvalStatue","1");//添加审批状态 通过 + String comment = "同意"; + taskService.addComment(taskId,processInstanceId,comment);//添加审批意见 + taskService.complete(taskId, variables); //保存项目信息 info.setStage("1");//最开始的状态。项目入库中 - this.save(info);//保存项目信息 + if(info.getId()!=null){ + //批量入库后，有项目负责人重新发起入库申请 + userprojectService.removeByProjectId(info.getId(),"0"); + this.updateById(info); + }else{ + this.save(info);//保存项目信息 + } userprojectService.saveFromProject(info,"0");//保存项目联系人信息，0表示当前醒目是主项目 - WorkFlow workFlow = workflowService.createFlow("creatProjectinfo",info.getId());//创建流程 + } @Override - @Transactional public void batchImportProjects(MultipartFile multipartFile) throws Exception { //是否有文件 if (multipartFile == null && multipartFile.getSize() == 0) { @@ -205,7 +255,6 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(HuzhouSubProjectinfo::getProjectId,projectId); + queryWrapper.eq(HuzhouSubProjectinfo::getProjectId,projectId);//获取所有已有子项目数据 List list = list(queryWrapper); if(list!=null&&list.size()>0){ - - //说明是子项目修改 + //有子项目 + //说明是子项目修改 总金额-子项目+本子行项目 if(subprojectinfo.getId()!=null){ + //计算子项剩余金额额度 HuzhouSubProjectinfo subProjectinfo = getById(subprojectinfo.getId()); - subprojectinfo.setCentralMoney(byId.getCentralMoney()+subProjectinfo.getCentralMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getCentralMoney).sum()); - subprojectinfo.setCityMoney(byId.getCityMoney()+subProjectinfo.getCityMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getCityMoney).sum()); - subprojectinfo.setSelfMoney(byId.getSelfMoney()+subProjectinfo.getSelfMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getSelfMoney).sum()); - subprojectinfo.setProvincialMoney(byId.getProvincialMoney()+subProjectinfo.getProvincialMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getProvincialMoney).sum()); - subprojectinfo.setCountyMoney(byId.getCountyMoney()+subProjectinfo.getCountyMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getCountyMoney).sum()); - subprojectinfo.setTotalMoney(byId.getTotalMoney()+subProjectinfo.getTotalMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getTotalMoney).sum()); - subprojectinfo.setPayamount2023Money(byId.getPayamount2023Money()+subProjectinfo.getPayamount2023Money()-list.stream().mapToDouble(HuzhouProjectinfo::getPayamount2023Money).sum()); - subprojectinfo.setPayamount2024Money(byId.getPayamount2024Money()+subProjectinfo.getPayamount2024Money()-list.stream().mapToDouble(HuzhouProjectinfo::getPayamount2024Money).sum()); - subprojectinfo.setPayamount2025Money(byId.getPayamount2025Money()+subProjectinfo.getPayamount2025Money()-list.stream().mapToDouble(HuzhouProjectinfo::getPayamount2025Money).sum()); + subprojectinfo.setCentralMoney(fatherProject.getCentralMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getCentralMoney).sum()); + subprojectinfo.setCityMoney(fatherProject.getCityMoney()+subProjectinfo.getCityMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getCityMoney).sum()); + subprojectinfo.setSelfMoney(fatherProject.getSelfMoney()+subProjectinfo.getSelfMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getSelfMoney).sum()); + subprojectinfo.setProvincialMoney(fatherProject.getProvincialMoney()+subProjectinfo.getProvincialMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getProvincialMoney).sum()); + subprojectinfo.setCountyMoney(fatherProject.getCountyMoney()+subProjectinfo.getCountyMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getCountyMoney).sum()); + subprojectinfo.setTotalMoney(fatherProject.getTotalMoney()+subProjectinfo.getTotalMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getTotalMoney).sum()); + subprojectinfo.setPayamount2023Money(fatherProject.getPayamount2023Money()+subProjectinfo.getPayamount2023Money()-list.stream().mapToDouble(HuzhouProjectinfo::getPayamount2023Money).sum()); + subprojectinfo.setPayamount2024Money(fatherProject.getPayamount2024Money()+subProjectinfo.getPayamount2024Money()-list.stream().mapToDouble(HuzhouProjectinfo::getPayamount2024Money).sum()); + subprojectinfo.setPayamount2025Money(fatherProject.getPayamount2025Money()+subProjectinfo.getPayamount2025Money()-list.stream().mapToDouble(HuzhouProjectinfo::getPayamount2025Money).sum()); }else{ - subprojectinfo.setCentralMoney(byId.getCentralMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getCentralMoney).sum()); - subprojectinfo.setCityMoney(byId.getCityMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getCityMoney).sum()); - subprojectinfo.setSelfMoney(byId.getSelfMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getSelfMoney).sum()); - subprojectinfo.setProvincialMoney(byId.getProvincialMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getProvincialMoney).sum()); - subprojectinfo.setCountyMoney(byId.getCountyMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getCountyMoney).sum()); - subprojectinfo.setTotalMoney(byId.getTotalMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getTotalMoney).sum()); - subprojectinfo.setPayamount2023Money(byId.getPayamount2023Money()-list.stream().mapToDouble(HuzhouProjectinfo::getPayamount2023Money).sum()); - subprojectinfo.setPayamount2024Money(byId.getPayamount2024Money()-list.stream().mapToDouble(HuzhouProjectinfo::getPayamount2024Money).sum()); - subprojectinfo.setPayamount2025Money(byId.getPayamount2025Money()-list.stream().mapToDouble(HuzhouProjectinfo::getPayamount2025Money).sum()); + //子项目有新增 + subprojectinfo.setCentralMoney(fatherProject.getCentralMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getCentralMoney).sum()); + subprojectinfo.setCityMoney(fatherProject.getCityMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getCityMoney).sum()); + subprojectinfo.setSelfMoney(fatherProject.getSelfMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getSelfMoney).sum()); + subprojectinfo.setProvincialMoney(fatherProject.getProvincialMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getProvincialMoney).sum()); + subprojectinfo.setCountyMoney(fatherProject.getCountyMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getCountyMoney).sum()); + subprojectinfo.setTotalMoney(fatherProject.getTotalMoney()-list.stream().mapToDouble(HuzhouProjectinfo::getTotalMoney).sum()); + subprojectinfo.setPayamount2023Money(fatherProject.getPayamount2023Money()-list.stream().mapToDouble(HuzhouProjectinfo::getPayamount2023Money).sum()); + subprojectinfo.setPayamount2024Money(fatherProject.getPayamount2024Money()-list.stream().mapToDouble(HuzhouProjectinfo::getPayamount2024Money).sum()); + subprojectinfo.setPayamount2025Money(fatherProject.getPayamount2025Money()-list.stream().mapToDouble(HuzhouProjectinfo::getPayamount2025Money).sum()); } }else { HuzhouSubProjectinfo huzhouSubProjectinfo = new HuzhouSubProjectinfo(); - BeanUtils.copyProperties(byId,huzhouSubProjectinfo); + BeanUtils.copyProperties(fatherProject,huzhouSubProjectinfo); return huzhouSubProjectinfo; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java index d31a9f5..aa0f5ec 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java @@ -88,13 +88,13 @@ public class WorkflowServiceImpl implements IWorkflowService { activitiProcessDefinitionVO.setBusinessKey(uuid); activitiProcessDefinitionVO.setBusinessDetailsPath("/"+processDefinitionKey); activitiProcessDefinitionVO.setBusinessTitle(processDefinitionKey); - JSONObject entries = activitiProcessDefinitionService.startProcessInstanceHuzhou(activitiProcessDefinitionVO); - String string = JSON.toJSONString(entries); - Map map = JSON.parseObject(string, Map.class); + HashMap map = activitiProcessDefinitionService.startProcessInstanceHuzhou(activitiProcessDefinitionVO); String processInstanceId = (String) map.get("processInstanceId"); + Task task = (Task) map.get("task"); WorkFlow workFlow = new WorkFlow(); workFlow.setBusinessKey(uuid); workFlow.setProcessInstanceId(processInstanceId); + workFlow.setTask(task); if(id!=null){ HuzhouProcessinfo huzhouProcessinfo = new HuzhouProcessinfo(); huzhouProcessinfo.setBusinesskey(uuid); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/HuzhouProjectinfoOV.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/HuzhouProjectinfoOV.java index fca64b4..2447fed 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/HuzhouProjectinfoOV.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/vo/HuzhouProjectinfoOV.java @@ -1,13 +1,7 @@ package com.easy.admin.modules.huzhou.vo; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfo; import com.easy.admin.modules.huzhou.entity.HuzhouSubProjectinfo; -import com.easy.admin.modules.huzhou.handler.HuzhouSubProjectHandler; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data;