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-25 14:37:48 +08:00
parent 5d392877cf
commit 8d3b39e9e3
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportFileDao.java
+4
View File
@@ -4,6 +4,8 @@ import com.adc.da.report.eo.ReportFile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface ReportFileDao extends BaseMapper<ReportFile> {
void delByReportId(@Param("pageVO") ReportFile reportFile);
@@ -11,4 +13,6 @@ public interface ReportFileDao extends BaseMapper<ReportFile> {
void actEndDelReport(@Param("reportId")String reportId);
void updateState(@Param("reportId")String dataId);
List<ReportFile> selectByReport(@Param("pageVO")ReportFile reportFile);
}
adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportFileMapper.xml
+12
View File
@@ -26,4 +26,16 @@
</where>
</delete>
<select id="selectByReport" resultType="com.adc.da.report.eo.ReportFile">
select rf.*,f.file_name as fileName from ts_report_file rf
LEFT JOIN ts_file f on f.FILE_ID = rf.file_id
<where>
<if test="pageVO.reportId !=null and pageVO.reportId !=''">
AND report_id = #{pageVO.reportId}
</if>
<if test="pageVO.state !=null">
AND state = #{pageVO.state}
</if>
</where>
</select>
</mapper>
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
+17 -4
View File
@@ -2,11 +2,9 @@ package com.adc.da.wkflow.business_activiti.task;
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.ReportDao;
import com.adc.da.report.dao.mysql.TreeLabelDao;
import com.adc.da.report.dao.mysql.TtReportManageActDao;
import com.adc.da.report.dao.mysql.*;
import com.adc.da.report.eo.ReportEntity;
import com.adc.da.report.eo.ReportFile;
import com.adc.da.report.eo.TtReportManageAct;
import com.adc.da.report.vo.PowerApplyActPageVO;
import com.adc.da.sys.service.iservice.IUserEoService;
@@ -87,6 +85,9 @@ public class TodoTaskController {
@Autowired
private TtReportManageActDao ttReportManageActDao;
@Autowired
private ReportFileDao reportFileDao;
@Autowired
private ReportDao reportDao;
@@ -619,6 +620,12 @@ public class TodoTaskController {
}else {
ttReportManageAct = ttReportManageActDao.selectByPrcId(pId);
}
// 为空说明流程已经结束
if (ttReportManageAct.getFileList().size() == 0){
List<ReportFile> reportFiles =
reportFileDao.selectByReport(new ReportFile(ttReportManageAct.getDataId(),2));
ttReportManageAct.setFileList(reportFiles);
}
List<String> labelList = treeLableDao.selectIdByReport(ttReportManageAct.getDataId());
ttReportManageAct.setLabelList(labelList);
String string = JSONArray.toJSONString(ttReportManageAct);
@@ -633,6 +640,12 @@ public class TodoTaskController {
}else {
ttReportManageAct = ttReportManageActDao.selectByPrcId(pId);
}
// 为空说明流程已经结束
if (ttReportManageAct.getFileList().size() == 0){
List<ReportFile> reportFiles =
reportFileDao.selectByReport(new ReportFile(ttReportManageAct.getDataId(),2));
ttReportManageAct.setFileList(reportFiles);
}
List<String> labelList = treeLableDao.selectIdByReport(ttReportManageAct.getDataId());
ttReportManageAct.setLabelList(labelList);
String string = JSONArray.toJSONString(ttReportManageAct);