diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java index 6f4bb6a..7965ce7 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java @@ -44,5 +44,7 @@ public interface TtReportManageActDao extends BaseMapper { */ List queryList(@Param("pageVO") TtReportManageActPageVO ttReportManageActPageVO); - TtReportManageActPageVO selectByDataId(String dataId); + TtReportManageAct selectByDataId(String dataId); + + TtReportManageAct selectByPrcId(String prcId); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java b/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java index c73c660..f472697 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java @@ -95,6 +95,12 @@ public class ReportEntity { @TableField("del_flag") private String delFlag; + /** + * 保密到期时间 + */ + @TableField("secrecy_last") + private Date secrecyLast; + /** * 用户id列表 */ diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java index e8618aa..7e1c069 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java @@ -113,11 +113,15 @@ public class TtReportManageAct { @TableField("del_flag") private Integer delFlag; - - /** - * 权限设置 + * 保密到期时间 */ + @TableField("secrecy_last") + private Date secrecyLast; + + @TableField("file_name") + private String fileName; + @TableField(exist = false) - private List powerList; + private List labelList; } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java index 4e30d21..e110bd2 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java @@ -4,7 +4,6 @@ package com.adc.da.report.service.impl; import com.adc.da.report.dao.mysql.PowerApplyDao; import com.adc.da.report.dao.mysql.ReportDao; import com.adc.da.report.dao.mysql.TtReportManageActDao; -import com.adc.da.report.eo.PowerApplyAct; import com.adc.da.report.eo.TtReportManageAct; import com.adc.da.report.service.ITtReportManageActService; import com.adc.da.report.vo.DeleteParamRequestVO; @@ -123,8 +122,5 @@ public class ITtReportManageActServiceImpl extends ServiceImpl powerList = ttReportManageAct.getPowerList(); - powerApplyDao.saveBatch(powerList); } } diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 210c100..947da47 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -4,21 +4,26 @@ - id, - data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag + id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, + createUserId, createDate, updateDate, del_flag,secrecy_last - #{Vo.id}, - #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, + #{Vo.id},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, #{Vo.confidentialLevel},#{Vo.privacyLevel}, #{Vo.createUserId}, - #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag} + #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag}, + #{Vo.secrecyLast} insert into TT_REPORT_MANAGE () - value () + value ( + #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, + #{Vo.confidentialLevel},#{Vo.privacyLevel}, + #{Vo.createUserId}, + #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag}, + #{Vo.secrecyLast}) - SELECT - - FROM + a.id, + task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag + ,secrecy_last,file_name + ,label.label as lableName,label.id as labelId + FROM a + LEFT JOIN ts_report_label rl on rl.report_id = a.data_id + LEFT JOIN ts_tree_label label on rl.label_id = label.id data_id = #{dataId} + diff --git a/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class b/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class index 83a07ed..dd21bec 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class and b/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/eo/ReportEntity.class b/adc-da-report/target/classes/com/adc/da/report/eo/ReportEntity.class index 5266edc..57c549f 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/eo/ReportEntity.class and b/adc-da-report/target/classes/com/adc/da/report/eo/ReportEntity.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/eo/TtReportManageAct.class b/adc-da-report/target/classes/com/adc/da/report/eo/TtReportManageAct.class index dd238bf..27e69c5 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/eo/TtReportManageAct.class and b/adc-da-report/target/classes/com/adc/da/report/eo/TtReportManageAct.class differ diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.class index 0151e76..fbe1255 100644 Binary files a/adc-da-report/target/classes/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.class and b/adc-da-report/target/classes/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.class differ diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml index 210c100..947da47 100644 --- a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml @@ -4,21 +4,26 @@ - id, - data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag + id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, + createUserId, createDate, updateDate, del_flag,secrecy_last - #{Vo.id}, - #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, + #{Vo.id},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, #{Vo.confidentialLevel},#{Vo.privacyLevel}, #{Vo.createUserId}, - #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag} + #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag}, + #{Vo.secrecyLast} insert into TT_REPORT_MANAGE () - value () + value ( + #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, + #{Vo.confidentialLevel},#{Vo.privacyLevel}, + #{Vo.createUserId}, + #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag}, + #{Vo.secrecyLast}) - SELECT - - FROM + a.id, + task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag + ,secrecy_last,file_name + ,label.label as lableName,label.id as labelId + FROM a + LEFT JOIN ts_report_label rl on rl.report_id = a.data_id + LEFT JOIN ts_tree_label label on rl.label_id = label.id data_id = #{dataId} + diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index a6fb932..cf2db9c 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -4,7 +4,9 @@ import com.adc.da.base.web.BaseController; import com.adc.da.excel.poi.excel.ExcelImportUtil; import com.adc.da.excel.poi.excel.entity.ImportParams; import com.adc.da.sys.constant.SysConstants; +import com.adc.da.sys.dao.mysql.UserOrgEODao; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserOrgEO; import com.adc.da.sys.service.iservice.IUserEoService; import com.adc.da.sys.util.EncryptUtil; import com.adc.da.sys.util.RSAUtil; @@ -14,6 +16,7 @@ import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import com.adc.da.util.utils.FileUtil; import com.adc.da.util.utils.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -35,6 +38,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -47,6 +51,8 @@ public class UserEOController extends BaseController { @Resource private IUserEoService userEOService; + private UserOrgEODao userOrgEODao; + @Value("${isPassEncrypted}") private boolean isPassEncrypted; @@ -112,7 +118,20 @@ public class UserEOController extends BaseController { userEOService.save(eo); - + //保存部门 + LambdaQueryWrapper userOrgEOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + userOrgEOLambdaQueryWrapper.eq(UserOrgEO::getUserId,eo.getUsid()); + userOrgEODao.delete(userOrgEOLambdaQueryWrapper); + String orgId = eo.getOrgId(); + String[] split = orgId.split(","); + List userOrgEOS = new ArrayList<>(); + for (String s : split) { + UserOrgEO userOrgEO = new UserOrgEO(); + userOrgEO.setUserId(eo.getUsid()); + userOrgEO.setOrgId(s); + userOrgEOS.add(userOrgEO); + } + userOrgEODao.insertBatch(userOrgEOS); return Result.success(); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java index c3253a5..2559953 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java @@ -97,6 +97,8 @@ public class UserEO extends BaseEntity implements Serializable { @TableField("USNAME") private String usname; + @TableField(exist = false) + private String orgId; /** * 角色ID列表 @@ -110,6 +112,12 @@ public class UserEO extends BaseEntity implements Serializable { @TableField(exist = false) private List roleEOList = new ArrayList<>(); + /** + * 部门EO列表 + */ + @TableField(exist = false) + private List orgList = new ArrayList<>(); + @TableField(exist = false) private String roleId; diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml index 0cd18df..a136665 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -57,6 +57,10 @@ + + + + @@ -93,10 +97,19 @@ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class index be220f3..57e7c2f 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class and b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class differ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/entity/UserEO.class b/adc-da-sys/target/classes/com/adc/da/sys/entity/UserEO.class index 8ecf515..ebb7654 100644 Binary files a/adc-da-sys/target/classes/com/adc/da/sys/entity/UserEO.class and b/adc-da-sys/target/classes/com/adc/da/sys/entity/UserEO.class differ diff --git a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml index 0cd18df..a136665 100644 --- a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -57,6 +57,10 @@ + + + + @@ -93,10 +97,19 @@ diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java index f9e4f4b..82edc9b 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java @@ -13,9 +13,7 @@ import com.adc.da.wkflow.util.ImpulseSenderUtils; import com.adc.da.wkflow.util.activiti.ActivitiTools; import com.adc.da.wkflow.util.wrapper.WrapMapper; import com.adc.da.wkflow.util.wrapper.Wrapper; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -155,6 +153,7 @@ public class ActivitDefineController { String id = jsonObject.getString("id"); String userId = jsonObject.getString("loginUserId"); String bpnId = jsonObject.getString("bpnId"); + String reportId = jsonObject.getString("reportId"); Object dataMsg = jsonObject.get("dataMsg"); Object approveData =jsonObject.get("approveData"); @@ -187,9 +186,9 @@ public class ActivitDefineController { busProcessName.setCreatUserName(byId.getUsname()); busProcessName.setPrcNum((String) prcNameAndPrcNum.get("prcNum")); busProcessName.setPrcType(prcType); - String data = JSON.toJSONString(dataMsg, SerializerFeature.DisableCircularReferenceDetect); - String dateId = activitDefineService.saveOrUpdateDate(prcType,data,task.getId(),pi.getId()); - busProcessName.setDataId(dateId); +// String data = JSON.toJSONString(dataMsg, SerializerFeature.DisableCircularReferenceDetect); +// String dateId = activitDefineService.saveOrUpdateDate(prcType,data,task.getId(),pi.getId(),reportId); +// busProcessName.setDataId(dateId); // busProcessName.setPrcName((String) prcNameAndPrcNum.get("prcName")); busProcessName.setPrcName(jsonObject.getString("prcName")); busProcessName.setSubmitStatus(SubmitStatusEnum.SUBMIT.getValue()); @@ -210,9 +209,9 @@ public class ActivitDefineController { one.setPrcId(pi.getId()); one.setSubmitStatus(SubmitStatusEnum.SUBMIT.getValue()); one.setCreatTime(sdf.format(new Date())); - String data = JSON.toJSONString(dataMsg, SerializerFeature.DisableCircularReferenceDetect); - String dateId = activitDefineService.saveOrUpdateDate(prcType,data,task.getId(),pi.getId()); - one.setDataId(dateId); +// String data = JSON.toJSONString(dataMsg, SerializerFeature.DisableCircularReferenceDetect); +// String dateId = activitDefineService.saveOrUpdateDate(prcType,data,task.getId(),pi.getId(),reportId); +// one.setDataId(dateId); ibusprocessnameService.save(one); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java index 4667c85..ccc8e70 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java @@ -1,10 +1,13 @@ package com.adc.da.wkflow.business_activiti.service; import com.adc.da.report.dao.mysql.PowerApplyActDao; +import com.adc.da.report.dao.mysql.ReportLabelDao; import com.adc.da.report.dao.mysql.TtReportManageActDao; import com.adc.da.report.eo.PowerApplyAct; +import com.adc.da.report.eo.ReportLabelEntity; import com.adc.da.report.eo.TtReportManageAct; import com.adc.da.report.service.IPowerApplyActService; +import com.adc.da.report.service.IReportLabelService; import com.adc.da.report.service.ITtReportManageActService; import com.adc.da.util.utils.StringUtils; import com.alibaba.fastjson.JSONObject; @@ -13,7 +16,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; @@ -35,47 +37,44 @@ public class ActivitDefineService { @Autowired ITtReportManageActService ttReportManageActService; + @Autowired + private ReportLabelDao reportLabelDao; + @Autowired + private IReportLabelService iReportLabelService; + //保存data数据 - public String saveOrUpdateDate(String prcType, String dataJson,String taskId,String prcId) { - String dataId = UUID.randomUUID().toString().replaceAll("-",""); + public String saveOrUpdateDate(String prcType, String dataJson,String taskId,String prcId,String reportId) { + if (StringUtils.isBlank(reportId)){ + reportId = UUID.randomUUID().toString().replace("-",""); + } if ("1".equals(prcType)){ List powerApplyActs = JSONObject.parseArray(dataJson, PowerApplyAct.class); for (PowerApplyAct powerApplyAct : powerApplyActs) { powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-","")); - powerApplyAct.setDataId(dataId); + powerApplyAct.setDataId(reportId); powerApplyAct.setTaskId(taskId); powerApplyAct.setPrcId(prcId); powerApplyAct.setDelFlag(0); powerApplyAct.setCreateDate(new Date()); } powerApplyActDao.batchInsert(powerApplyActs); - }else if ("2".equals(prcType)){ + }else if ("4".equals(prcType)){ TtReportManageAct ttReportManageAct = JSONObject.parseObject(dataJson, TtReportManageAct.class); - ttReportManageAct.setDataId(dataId); + ttReportManageAct.setDataId(reportId); ttReportManageAct.setTaskId(taskId); ttReportManageAct.setPrcId(prcId); ttReportManageAct.setDelFlag(0); ttReportManageAct.setCreateDate(new Date()); ttReportManageActService.saveOrUpdateSingle(ttReportManageAct); - //权限 - List powerApplyActs = new ArrayList<>(); - List powerList = ttReportManageAct.getPowerList(); - for (PowerApplyAct powerApplyAct : powerList) { - if (StringUtils.isEmpty(powerApplyAct.getId())){ - powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-","")); - powerApplyAct.setReportId(ttReportManageAct.getId()); - powerApplyAct.setDataId(dataId); -// powerApplyAct.setTaskId(taskId); - powerApplyAct.setPrcId(prcId); - powerApplyAct.setDelFlag(0); - powerApplyAct.setCreateDate(new Date()); - powerApplyActs.add(powerApplyAct); - } - } - if (powerApplyActs.size()>0){ - powerApplyActDao.batchInsert(powerApplyActs); - } + //插入报表标签关系表 + //修改报表标签关系表(先删后增) + iReportLabelService.deleteReportLabelByReportId(new String[]{reportId}); + ttReportManageAct.getLabelList().forEach((label) -> { + ReportLabelEntity reportLabelEntity = new ReportLabelEntity(com.adc.da.util.utils.UUID.randomUUID10() + ,ttReportManageAct.getDataId(), label); + reportLabelDao.insert(reportLabelEntity); + }); } - return dataId; + return reportId; } } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index 4d4781b..c5ebe89 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -4,8 +4,8 @@ import cn.hutool.core.util.StrUtil; import com.adc.da.login.util.UserUtils; import com.adc.da.report.dao.mysql.PowerApplyActDao; import com.adc.da.report.dao.mysql.TtReportManageActDao; +import com.adc.da.report.eo.TtReportManageAct; import com.adc.da.report.vo.PowerApplyActPageVO; -import com.adc.da.report.vo.TtReportManageActPageVO; import com.adc.da.sys.service.iservice.IUserEoService; import com.adc.da.sys.vo.UserVO; import com.adc.da.util.exception.AdcDaBaseException; @@ -282,6 +282,7 @@ public class TodoTaskController { public Wrapper completeTaskByUserId(@RequestBody ApproveDataVO busMes) { log.info("!!!!!!!!!!!!!TaskId!!!!!!!!!!!!!!!"+busMes.getTaskId()); String dataJson = busMes.getDataJson(); + String reportId = busMes.getReportId(); if (busMes.getTaskId() != null && !busMes.getTaskId().equals("")) { Task task = taskService.createTaskQuery().taskId(busMes.getTaskId()).singleResult(); if(task!=null){ @@ -297,7 +298,8 @@ public class TodoTaskController { ibusProcessApproveService.save(busProcessApprove); if (StringUtils.isNotEmpty(dataJson)){ //根据业务情况 对业务数据进行saveOrupdate - activitDefineService.saveOrUpdateDate(busMes.getPrcType(),dataJson, task.getId(),task.getProcessInstanceId()); + activitDefineService.saveOrUpdateDate(busMes.getPrcType(),dataJson, task.getId(), + task.getProcessInstanceId(),reportId); } taskService.complete(busMes.getTaskId()); } @@ -444,11 +446,9 @@ public class TodoTaskController { String string = JSONArray.toJSONString(powerApplyActs); //去对应的 数据表查数据 busProcessNewVO.setDataJson(string); - }else if ("2".equals(prcType)){ - TtReportManageActPageVO ttReportManageActPageVO = ttReportManageActDao.selectByDataId(dataId); - List powerApplyActs = powerApplyActDao.selectListByPrcId(ttReportManageActPageVO.getPrcId()); - ttReportManageActPageVO.setPowerList(powerApplyActs); - String string = JSONArray.toJSONString(ttReportManageActPageVO); + }else if ("4".equals(prcType)){ + TtReportManageAct ttReportManageAct = ttReportManageActDao.selectByDataId(dataId); + String string = JSONArray.toJSONString(ttReportManageAct); //去对应的 数据表查数据 busProcessNewVO.setDataJson(string); } @@ -458,23 +458,27 @@ public class TodoTaskController { private BusProcessNewVO queryDetailDate(BusProcessNew busProcessNew, String prcType, Integer tag) { BusProcessNewVO busProcessNewVO = new BusProcessNewVO(); BeanUtils.copyProperties(busProcessNew,busProcessNewVO); + String pId = busProcessNew.getPId(); String dataId = busProcessNew.getDataId(); if ("1".equals(prcType)){ List powerApplyActs = new ArrayList<>(); - if (tag == 1){ + if (StringUtils.isBlank(pId)){ //代办查看详情 - powerApplyActs = powerApplyActDao.selectListBydataIdNodel(dataId); - }else { powerApplyActs = powerApplyActDao.selectListBydataId(dataId); + }else { + powerApplyActs = powerApplyActDao.selectListByPrcId(pId); } String string = JSONArray.toJSONString(powerApplyActs); //去对应的 数据表查数据 busProcessNewVO.setDataJson(string); - }else if("2".equals(prcType)){ - TtReportManageActPageVO ttReportManageActPageVO = ttReportManageActDao.selectByDataId(dataId); - List powerApplyActs = powerApplyActDao.selectListByPrcId(ttReportManageActPageVO.getPrcId()); - ttReportManageActPageVO.setPowerList(powerApplyActs); - String string = JSONArray.toJSONString(ttReportManageActPageVO); + }else if("4".equals(prcType)){ + TtReportManageAct ttReportManageAct = new TtReportManageAct(); + if (StringUtils.isBlank(pId)){ + ttReportManageAct = ttReportManageActDao.selectByDataId(dataId); + }else { + ttReportManageAct = ttReportManageActDao.selectByPrcId(pId); + } + String string = JSONArray.toJSONString(ttReportManageAct); //去对应的 数据表查数据 busProcessNewVO.setDataJson(string); } @@ -491,6 +495,7 @@ public class TodoTaskController { public Wrapper saveTaskFirst(@RequestBody ApproveDataVO approveDataVO) { String dataJson = approveDataVO.getDataJson(); String submitJson = approveDataVO.getSubmitJson(); + String reportId = approveDataVO.getReportId(); String saveId = null; String dataId = null; if (approveDataVO.getId() != null && !approveDataVO.getId().equals("")) { @@ -509,7 +514,7 @@ public class TodoTaskController { if (StringUtils.isNotEmpty(dataJson)){ //根据业务情况 对业务数据进行saveOrupdate dataId = activitDefineService.saveOrUpdateDate(approveDataVO.getPrcType(), dataJson, null, - null); + null,reportId); busProcessName.setDataId(dataId); } iBusProcessNameService.saveOrUpdate(busProcessName); @@ -521,7 +526,7 @@ public class TodoTaskController { if (StringUtils.isNotEmpty(dataJson)) { //根据业务情况 对业务数据进行saveOrupdate dataId = activitDefineService.saveOrUpdateDate(approveDataVO.getPrcType(), dataJson, - approveDataVO.getTaskId(),""); + approveDataVO.getTaskId(),"",reportId); busProcessName.setDataId(dataId); } busProcessName.setPrcType(approveDataVO.getPrcType()); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java index 6050223..dcd5441 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java @@ -43,9 +43,9 @@ public class BusProcessNameServiceImpl extends ServiceImpl result = new HashMap<>(); String prcName = ""; String prcNum = ""; - if(StringUtils.equals(FlowTypeEnum.BGQXSQLC.getValue(), prcType)){ - prcName = FlowTypeEnum.BGQXSQLC.getPrcName(); - prcNum = FlowTypeEnum.BGQXSQLC.getPrcNum(); + if(StringUtils.equals(FlowTypeEnum.XZSQ.getValue(), prcType)){ + prcName = FlowTypeEnum.XZSQ.getPrcName(); + prcNum = FlowTypeEnum.XZSQ.getPrcNum(); }else if (StringUtils.equals(FlowTypeEnum.SCBGLC.getValue(), prcType)){ prcName = FlowTypeEnum.SCBGLC.getPrcName(); prcNum = FlowTypeEnum.SCBGLC.getPrcNum(); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/vo/ApproveDataVO.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/vo/ApproveDataVO.java index 6a998d8..ba3c7d6 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/vo/ApproveDataVO.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/vo/ApproveDataVO.java @@ -34,4 +34,6 @@ public class ApproveDataVO { private String prcName; + private String reportId; + } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java b/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java index f5620ba..5e5f2e1 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java @@ -5,8 +5,10 @@ package com.adc.da.wkflow.enums; */ public enum FlowTypeEnum { - BGQXSQLC("1","报告权限申请流程","QXSQ","报告权限申请流程",""), - SCBGLC("2","上传报告流程","SCBG","上传报告流程",""), + XZSQ("1","下载申请流程","QXSQ","下载申请流程",""), + YLSQ("2","预览申请流程","QXSQ","预览申请流程",""), + YLXZSQ("3","预览+下载申请流程","QXSQ","预览+下载申请流程",""), + SCBGLC("4","上传审批流程","SCBG","上传审批流程",""), ; private String value; diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java index f25ebee..05d17af 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java @@ -1,6 +1,7 @@ package com.adc.da.wkflow.listener.SCBG; import com.adc.da.login.util.UserUtils; +import com.adc.da.report.dao.mysql.ReportDao; import com.adc.da.report.dao.mysql.TtReportManageActDao; import com.adc.da.report.eo.TtReportManageAct; import com.adc.da.wkflow.business_main.entity.BusProcessApprove; @@ -24,6 +25,7 @@ public class oneApplyAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { TtReportManageActDao ttReportManageActDao = SpringContextUtil.getBean(TtReportManageActDao.class); + ReportDao reportDao = SpringContextUtil.getBean(ReportDao.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); //查询task任务 @@ -52,6 +54,10 @@ public class oneApplyAfter implements TaskListener { String s = object.getString("flag") == "" || object.getString("flag") == null ? FlagEnum.AGREE.getValue() : object.getString("flag"); // 1: 同意 2：退回 delegateTask.setVariable("flag",s); + if ("1".equals(s)){ +// ttReportManageActService.saveReport(ttReportManageAct); + reportDao.saveReportAct(ttReportManageAct); + } } } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/reEditAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/reEditAfter.java index 18ca0ab..19102b4 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/reEditAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/reEditAfter.java @@ -50,6 +50,5 @@ public class reEditAfter implements TaskListener { JSONObject object = JSONObject.parseObject(fromValsJson); delegateTask.setVariable("oneApprove",object.getString("oneApprove")); - delegateTask.setVariable("twoApprove",object.getString("twoApprove")); } } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/startAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/startAfter.java index d20bcc6..f44b899 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/startAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/startAfter.java @@ -50,7 +50,6 @@ public class startAfter implements TaskListener { JSONObject object = JSONObject.parseObject(fromValsJson); //审批人 delegateTask.setVariable("oneApprove",object.getString("oneApprove")); - delegateTask.setVariable("twoApprove",object.getString("twoApprove")); //发起人 delegateTask.setVariable("userId",object.getString("userId")); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.java deleted file mode 100644 index f49caac..0000000 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.adc.da.wkflow.listener.SCBG; - -import com.adc.da.login.util.UserUtils; -import com.adc.da.report.dao.mysql.PowerApplyActDao; -import com.adc.da.report.dao.mysql.TtReportManageActDao; -import com.adc.da.report.eo.PowerApplyAct; -import com.adc.da.report.eo.TtReportManageAct; -import com.adc.da.report.service.ITtReportManageActService; -import com.adc.da.wkflow.business_main.entity.BusProcessApprove; -import com.adc.da.wkflow.business_main.entity.BusProcessNew; -import com.adc.da.wkflow.business_main.service.IBusProcessApproveService; -import com.adc.da.wkflow.business_main.service.IBusProcessNewService; -import com.adc.da.wkflow.listener.FlagEnum; -import com.adc.da.wkflow.util.SpringContextUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.activiti.engine.delegate.DelegateTask; -import org.activiti.engine.delegate.TaskListener; - -import java.util.List; - -/** - * 上传报告 发起流程 - */ -public class twoApplyAfter implements TaskListener { - - @Override - public void notify(DelegateTask delegateTask) { - PowerApplyActDao powerApplyActDao = SpringContextUtil.getBean(PowerApplyActDao.class); - TtReportManageActDao ttReportManageActDao = SpringContextUtil.getBean(TtReportManageActDao.class); - ITtReportManageActService ttReportManageActService = SpringContextUtil.getBean(ITtReportManageActService.class); - IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); - IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); - //查询task任务 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(TtReportManageAct::getTaskId, delegateTask.getId()); - List ttReportManageActs = ttReportManageActDao.selectList(queryWrapper); - TtReportManageAct ttReportManageAct = new TtReportManageAct(); - if (ttReportManageActs.size()>0){ - ttReportManageAct = ttReportManageActs.get(0); - List powerApplyActs = powerApplyActDao.selectActListBydataId(ttReportManageAct.getCreateUserId()); - for (PowerApplyAct powerApplyAct : powerApplyActs) { - powerApplyAct.setReportId(ttReportManageAct.getId()); - } - ttReportManageAct.setPowerList(powerApplyActs); - } - //构建工作流代办 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setUserId(UserUtils.getUserId()); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setTaskInfo(delegateTask.getEventName()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setDataId(ttReportManageAct.getDataId()); - busBean.save(busProcessNew); - - //审批结果 - LambdaQueryWrapper approveWrapper = new LambdaQueryWrapper<>(); - approveWrapper.eq(BusProcessApprove::getTaskId, delegateTask.getId()); - List list = approveService.list(approveWrapper); - String fromValsJson = list.get(0).getFromValsJson(); - JSONObject object = JSONObject.parseObject(fromValsJson); - String s = object.getString("flag") == "" || object.getString("flag") == null ? FlagEnum.AGREE.getValue() : object.getString("flag"); - // 1: 同意 2：退回 - delegateTask.setVariable("flag",s); - if ("1".equals(s)){ - ttReportManageActService.saveReport(ttReportManageAct); - } - - } -} diff --git a/report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java b/report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java index ccb0484..73c9a56 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java @@ -69,7 +69,13 @@ public class ImpulseSenderUtils { String prcType = entry.getKey(); FlowTypeEnum flowTypeEnumByValue = FlowTypeEnum.getFlowTypeEnumByValue(prcType); switch (flowTypeEnumByValue){ - case BGQXSQLC: + case XZSQ: + bgqxsqNumber = new AtomicInteger(count); + case YLSQ: + bgqxsqNumber = new AtomicInteger(count); + case YLXZSQ: + bgqxsqNumber = new AtomicInteger(count); + case SCBGLC: bgqxsqNumber = new AtomicInteger(count); break; } @@ -88,13 +94,21 @@ public class ImpulseSenderUtils { throw new ActivitiException("非法的流程类型： " + flowType); } switch (flowTypeEnum){ - case BGQXSQLC: + case XZSQ: number = bgqxsqNumber.incrementAndGet(); - checkNumberLegitimate(number,"报告权限申请流程"); + checkNumberLegitimate(number,"下载申请流程"); + break; + case YLSQ: + number = bgqxsqNumber.incrementAndGet(); + checkNumberLegitimate(number,"预览申请流程"); + break; + case YLXZSQ: + number = bgqxsqNumber.incrementAndGet(); + checkNumberLegitimate(number,"预览+下载申请流程"); break; case SCBGLC: number = bgqxsqNumber.incrementAndGet(); - checkNumberLegitimate(number,"上传报告流程"); + checkNumberLegitimate(number,"上传审批流程"); break; default: throw new ActivitiException("流程类型 " + flowType + " 非法！"); diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class index c832aea..3258a07 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class index b3acb09..12651f6 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class index e14f121..bc012ff 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class index 3146428..80663ab 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class and b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.class b/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.class index 2a53838..fa630bb 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.class and b/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_main/vo/ApproveDataVO.class b/report-activity/target/classes/com/adc/da/wkflow/business_main/vo/ApproveDataVO.class index a6aae9c..7ec682b 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/business_main/vo/ApproveDataVO.class and b/report-activity/target/classes/com/adc/da/wkflow/business_main/vo/ApproveDataVO.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/enums/FlowTypeEnum.class b/report-activity/target/classes/com/adc/da/wkflow/enums/FlowTypeEnum.class index 73fb2f4..e654ece 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/enums/FlowTypeEnum.class and b/report-activity/target/classes/com/adc/da/wkflow/enums/FlowTypeEnum.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.class index 5b330b0..d7ffb36 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.class and b/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/reEditAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/reEditAfter.class index ccd9f8d..b03338d 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/reEditAfter.class and b/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/reEditAfter.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/startAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/startAfter.class index fd75597..1ddfc2b 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/startAfter.class and b/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/startAfter.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.class deleted file mode 100644 index a60b540..0000000 Binary files a/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.class and /dev/null differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils$1.class b/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils$1.class index 9ec4e64..8105b0d 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils$1.class and b/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils$1.class differ diff --git a/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils.class b/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils.class index 80b7453..294a178 100644 Binary files a/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils.class and b/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils.class differ