DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[新增] 权限申请流程

Browse Source
This commit is contained in:
bupengxiang
2023-05-09 16:35:16 +08:00
parent f42eaf211a
commit 7c793af87c
38 changed files with 175 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java
+8 -11
View File
@@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@Service
@@ -49,16 +48,14 @@ public class ActivitDefineService {
reportId = UUID.randomUUID().toString().replace("-","");
}
if ("1".equals(prcType)){
List<PowerApplyAct> powerApplyActs = JSONObject.parseArray(dataJson, PowerApplyAct.class);
for (PowerApplyAct powerApplyAct : powerApplyActs) {
powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-",""));
powerApplyAct.setDataId(reportId);
powerApplyAct.setTaskId(taskId);
powerApplyAct.setPrcId(prcId);
powerApplyAct.setDelFlag(0);
powerApplyAct.setCreateDate(new Date());
}
powerApplyActDao.batchInsert(powerApplyActs);
PowerApplyAct powerApplyAct = JSONObject.parseObject(dataJson, PowerApplyAct.class);
powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-",""));
powerApplyAct.setDataId(reportId);
powerApplyAct.setTaskId(taskId);
powerApplyAct.setPrcId(prcId);
powerApplyAct.setDelFlag(0);
powerApplyAct.setCreateDate(new Date());
iPowerApplyActService.saveOrUpdateSingle(powerApplyAct);
}else if ("4".equals(prcType)){
TtReportManageAct ttReportManageAct = JSONObject.parseObject(dataJson, TtReportManageAct.class);
ttReportManageAct.setDataId(reportId);
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
+14 -13
View File
@@ -438,15 +438,17 @@ public class TodoTaskController {
*/
@ApiOperation(value = "详情")
@GetMapping("/queryDetail")
public ResponseMessage queryDetail(@RequestParam("prcId") String prcId, @RequestParam("prcType")String prcType,
@RequestParam("tag") Integer tag) {
public ResponseMessage queryDetail(@RequestParam(value = "prcId",required = false) String prcId, @RequestParam("prcType")String prcType,
@RequestParam(value = "dataId",required = false) String dataId) {
List<BusProcessNew> busProcessNews = iBusProcessNewService.selectEOByTaskId(prcId);
BusProcessNew busProcessNew = null;
if (busProcessNews.size() == 0) {
return null;
busProcessNew = iBusProcessNewService.selectEOByDataId(dataId);
}else {
busProcessNew = busProcessNews.get(0);
}
BusProcessNew busProcessNew = busProcessNews.get(0);
// 查找详细业务数据
BusProcessNewVO busProcessNewVO = this.queryDetailDate(busProcessNew, prcType,tag);
BusProcessNewVO busProcessNewVO = this.queryDetailDate(busProcessNew, prcType);
//审批数据
List<BusProcessApprove> busProcessApproves =
busProcessApproveMapper.selectEoByPrcIdAndTask(busProcessNewVO.getPId());
@@ -482,8 +484,8 @@ public class TodoTaskController {
private BusProcessNewVO queryDetailDateByDataId(String dataId, String prcType) {
BusProcessNewVO busProcessNewVO = new BusProcessNewVO();
if ("1".equals(prcType)){
List<PowerApplyActPageVO> powerApplyActs = powerApplyActDao.selectListBydataId(dataId);
String string = JSONArray.toJSONString(powerApplyActs);
PowerApplyActPageVO powerApplyActPageVO = powerApplyActDao.selectListBydataId(dataId);
String string = JSONArray.toJSONString(powerApplyActPageVO);
//去对应的 数据表查数据
busProcessNewVO.setDataJson(string);
}else if ("4".equals(prcType)){
@@ -495,20 +497,19 @@ public class TodoTaskController {
return busProcessNewVO;
}
private BusProcessNewVO queryDetailDate(BusProcessNew busProcessNew, String prcType, Integer tag) {
private BusProcessNewVO queryDetailDate(BusProcessNew busProcessNew, String prcType) {
BusProcessNewVO busProcessNewVO = new BusProcessNewVO();
BeanUtils.copyProperties(busProcessNew,busProcessNewVO);
String pId = busProcessNew.getPId();
String dataId = busProcessNew.getDataId();
if ("1".equals(prcType)){
List<PowerApplyActPageVO> powerApplyActs = new ArrayList<>();
PowerApplyActPageVO powerApplyAct = new PowerApplyActPageVO();
if (StringUtils.isBlank(pId)){
//代办查看详情
powerApplyActs = powerApplyActDao.selectListBydataId(dataId);
powerApplyAct = powerApplyActDao.selectListBydataId(dataId);
}else {
powerApplyActs = powerApplyActDao.selectListByPrcId(pId);
powerApplyAct = powerApplyActDao.selectListByPrcId(pId);
}
String string = JSONArray.toJSONString(powerApplyActs);
String string = JSONArray.toJSONString(powerApplyAct);
//去对应的 数据表查数据
busProcessNewVO.setDataJson(string);
}else if("4".equals(prcType)){
report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/BusProcessNewMapper.java
+2
View File
@@ -26,6 +26,8 @@ public interface BusProcessNewMapper extends BaseMapper<BusProcessNew> {
List<BusProcessNew> findNoExecuteBusProcessNewForEnd(@Param("taskIds")List<String> taskIds);
List<BusProcessNew> selectEOByTaskId(@Param("prcId") String prcId);
BusProcessNew selectEOByDataId(@Param("dataId")String dataId);
// String queryTaskName(@Param("id")String id);
}
report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java
+1
View File
@@ -30,4 +30,5 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
List<BusProcessNew> findNoExecuteBusProcessNewForEnd(List<String> taskIdList);
List<BusProcessNew> selectEOByTaskId(String prcId);
BusProcessNew selectEOByDataId(String prcId);
}
report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java
+5
View File
@@ -73,4 +73,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
public List<BusProcessNew> selectEOByTaskId(String prcId) {
return baseMapper.selectEOByTaskId(prcId);
}
@Override
public BusProcessNew selectEOByDataId(String dataId) {
return baseMapper.selectEOByDataId(dataId);
}
}
report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java
+10 -3
View File
@@ -2,11 +2,13 @@ package com.adc.da.wkflow.listener.powerApply;
import com.adc.da.login.util.UserUtils;
import com.adc.da.report.dao.mysql.PowerApplyActDao;
import com.adc.da.report.dao.mysql.PowerApplyDao;
import com.adc.da.report.eo.PowerApplyAct;
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;
@@ -23,6 +25,7 @@ public class twoApplyAfter implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
PowerApplyActDao powerApplyActDao = SpringContextUtil.getBean(PowerApplyActDao.class);
PowerApplyDao powerApplyDao = SpringContextUtil.getBean(PowerApplyDao.class);
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
//查询task任务
@@ -35,12 +38,10 @@ public class twoApplyAfter implements TaskListener {
}
//构建工作流代办
BusProcessNew busProcessNew = new BusProcessNew();
// busProcessNew.setUserId(powerApplyAct.getUpdateUserId());
busProcessNew.setUserId(UserUtils.getUserId());
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setTaskInfo(delegateTask.getEventName());
busProcessNew.setTaskId(delegateTask.getId());
// busProcessNew.set(FlowTypeEnum.BGQXSQLC.getValue());
busProcessNew.setDataId(powerApplyAct.getDataId());
busBean.save(busProcessNew);
@@ -50,8 +51,14 @@ public class twoApplyAfter implements TaskListener {
List<BusProcessApprove> 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");
delegateTask.setVariable("oneApprove",object.getString("oneApprove"));
delegateTask.setVariable("twoApprove",object.getString("twoApprove"));
// 1: 同意 2：退回
delegateTask.setVariable("flag",s);
if ("1".equals(s)){
powerApplyDao.savePowerAct(powerApplyAct);
}
}
}
report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessNewMapper.xml
+4
View File
@@ -33,4 +33,8 @@
where BUS_PROCESS_NEW.P_ID = #{prcId}
order by CREATE_DATE desc
</select>
<select id="selectEOByDataId" resultType="com.adc.da.wkflow.business_main.entity.BusProcessNew">
select BUS_PROCESS_NEW.* from BUS_PROCESS_NEW
where BUS_PROCESS_NEW.DATA_ID = #{dataId}
</select>
</mapper>
report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class
BIN
View File
Binary file not shown.
report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class
BIN
View File
Binary file not shown.
report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class
BIN
View File
Binary file not shown.
report-activity/target/classes/com/adc/da/wkflow/business_main/mapper/BusProcessNewMapper.class
BIN
View File
Binary file not shown.
report-activity/target/classes/com/adc/da/wkflow/business_main/service/IBusProcessNewService.class
BIN
View File
Binary file not shown.
report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.class
BIN
View File
Binary file not shown.
report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.class
BIN
View File
Binary file not shown.
report-activity/target/classes/mybatis/mapper/mysql/BusProcessNewMapper.xml
+4
View File
@@ -33,4 +33,8 @@
where BUS_PROCESS_NEW.P_ID = #{prcId}
order by CREATE_DATE desc
</select>
<select id="selectEOByDataId" resultType="com.adc.da.wkflow.business_main.entity.BusProcessNew">
select BUS_PROCESS_NEW.* from BUS_PROCESS_NEW
where BUS_PROCESS_NEW.DATA_ID = #{dataId}
</select>
</mapper>
report-activity/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+1 -1
View File
@@ -11,7 +11,6 @@ com\adc\da\wkflow\business_main\service\IBusProcessApproveService.class
com\adc\da\wkflow\business_activiti\task\TaskController.class
com\adc\da\wkflow\business_activiti\task\TempTestController.class
com\adc\da\wkflow\business_main\service\IBusProcessEntrustService.class
com\adc\da\wkflow\listener\SCBG\twoApplyAfter.class
com\adc\da\wkflow\listener\FlagEnum.class
com\adc\da\wkflow\business_main\mapper\BusProcessApproveMapper.class
com\adc\da\wkflow\enums\SubmitStatusEnum.class
@@ -25,6 +24,7 @@ com\adc\da\wkflow\business_activiti\service\ActivitDefineService.class
com\adc\da\wkflow\listener\SetupPersonnelFront.class
com\adc\da\wkflow\business_main\vo\ApproveDataVO.class
com\adc\da\wkflow\util\wrapper\Wrapper.class
com\adc\da\wkflow\dto\StartProcessEO.class
com\adc\da\wkflow\business_activiti\dto\StandardDTONew.class
com\adc\da\wkflow\util\file\FileTools.class
com\adc\da\wkflow\business_main\service\impl\BusProcessNewServiceImpl.class
report-activity/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+1 -1
View File
@@ -62,11 +62,11 @@ D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\co
D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_activiti\dto\Form.java
D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_activiti\model\ActivitiModelImageController.java
D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_main\vo\ApproveDataVO.java
D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\listener\SCBG\twoApplyAfter.java
D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_activiti\dto\Page.java
D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_activiti\dto\ProjectAssessDTO.java
D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_activiti\instance\ActivitiInstanceController.java
D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_main\service\impl\BusProcessApproveServiceImpl.java
D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\util\SpringContextUtil.java
D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_main\vo\BusProcessNewVO.java
D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\dto\StartProcessEO.java
D:\desktop\hzwl\dazhong\faw-report-library-boot\report-activity\src\main\java\com\adc\da\wkflow\business_main\entity\BusProcessApprove.java
report-activity/target/report-activity-2.5.0.jar
BIN
View File
Binary file not shown.