From 8ee3f2b86b9a0bb12c54b8057c1f8863c92f1e14 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Wed, 26 Apr 2023 10:05:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=88=97=E8=A1=A8sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ReportManageConroller.java | 13 +++++ .../adc/da/report/dao/mysql/ReportDao.java | 2 + .../adc/da/report/service/IReportService.java | 2 + .../service/impl/IReportServiceImpl.java | 24 +++++++++ .../java/com/adc/da/report/vo/ReportVo.java | 5 +- .../mapper/mysql/ReportManageMapper.xml | 52 +++++++++++++++++++ 6 files changed, 97 insertions(+), 1 deletion(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java index 280152d..0910740 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java @@ -96,6 +96,19 @@ public class ReportManageConroller { return Result.success(list); } + /** + * 报告列表 + * @param vo + * @return + * @throws Exception + */ + @ApiOperation("报告列表") + @PostMapping("/page") + public ResponseMessage page(@RequestBody ReportQueryVo vo) throws Exception { + IPage list = reportService.page(vo); + return Result.success(list); + } + /** * 报告列表(带权限验证) * @param vo diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java index 90a0d73..1d9fc2b 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java @@ -34,4 +34,6 @@ public interface ReportDao extends BaseMapper { List getReportDateList(@Param("usid")String usid); IPage getAddReportPage(IPage page, @Param("pageVO") ReportQueryVo vo); + + IPage page(IPage page,@Param("pageVO") ReportQueryVo vo); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java b/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java index 83d2904..11da10c 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java @@ -49,4 +49,6 @@ public interface IReportService { String reportHtml(String id); IPage addReportPage(ReportQueryVo vo) throws Exception; + + IPage page(ReportQueryVo vo); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index 751275c..36a8088 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -372,6 +372,30 @@ public class IReportServiceImpl extends ServiceImpl return list; } + @Override + public IPage page(ReportQueryVo vo) { + IPage page = new Page<>(); + page.setCurrent(vo.getPageNo()); + page.setSize(vo.getPageSize()); + //判断是不是管理员 + boolean admin = false; + List roleEOList = roleEODao.selectByuserId(UserUtils.getUserId()); + for (RoleEO roleEO : roleEOList) { + if ("管理员".equals(roleEO.getName())){ + admin= !admin; + } + } + if (admin) { + vo.setUsid(null); + } else { + vo.setUsid(UserUtils.getUserId()); + } + + IPage list = reportDao.page(page, vo); + + return list; + } + /** * 创建htmlstring * diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java index 66cfeb7..e108dc8 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java @@ -1,6 +1,5 @@ package com.adc.da.report.vo; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.List; @@ -27,6 +26,10 @@ public class ReportVo { */ private String keyContent; + /** + * 权限 + */ + private Integer power; /** * 主要内容 */ 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 d877337..f4103a8 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 @@ -223,6 +223,58 @@ + + From 7819bc6c0cf2bb9702ea62ddb74b55eabcb25572 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Wed, 26 Apr 2023 10:29:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=9A=84=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TaskController.java | 25 +++++++++++++------ .../wkflow/util/activiti/ActivitiTools.java | 14 +++++++++-- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java index e6a8c37..c718409 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java @@ -28,10 +28,13 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.Duration; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.*; -import static com.adc.da.wkflow.util.date.DateTools.disposeApprovalTime; - @Api(tags = "流程明细管理") @RestController @RequestMapping("/${restPath}/task") @@ -58,7 +61,7 @@ public class TaskController { @ApiOperation(value = "流程实例明细列表") @ApiImplicitParam(name = "prcNum", value = "流程实例id") @GetMapping("/get_list_by_instance") - public List> get_list_by_instance(String prcNum,String sortWord,String shunxu) { + public List> get_list_by_instance(String prcNum,String sortWord,String shunxu) throws ParseException { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("PRC_NUM",prcNum); BusProcessName one = iBusProcessNameService.getOne(queryWrapper); @@ -130,11 +133,17 @@ public class TaskController { historicTaskInstance.put("approvalResult",formValsJsonMap.get("flag")!=null ? formValsJsonMap.get("flag"):""); historicTaskInstance.put("approvalFile",formValsJsonMap.get("approvalFile")!=null ? formValsJsonMap.get("approvalFile"):""); } - Date createTime = (Date) historicTaskInstance.get("createTime"); - Date endTime = (Date) historicTaskInstance.get("endTime"); - if(endTime!=null){ - long approvalTime = disposeApprovalTime(createTime,endTime); - historicTaskInstance.put("approvalTime",approvalTime + "小时"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date createTime = sdf.parse((String)historicTaskInstance.get("createTime")); + Object endTime1 = historicTaskInstance.get("endTime"); + if(endTime1!=null){ + Date endTime = sdf.parse((String)endTime1); +// long approvalTime = disposeApprovalTime(createTime,endTime); + LocalDateTime startDateTime = LocalDateTime.ofInstant(createTime.toInstant(), ZoneId.systemDefault()); + LocalDateTime endDateTime = LocalDateTime.ofInstant(endTime.toInstant(), ZoneId.systemDefault()); + + long days = Duration.between(startDateTime.toLocalDate().atStartOfDay(), endDateTime.toLocalDate().atStartOfDay()).toDays() + 1; + historicTaskInstance.put("approvalTime",days + "天"); } } if(StringUtils.isNotBlank(sortWord)){ diff --git a/report-activity/src/main/java/com/adc/da/wkflow/util/activiti/ActivitiTools.java b/report-activity/src/main/java/com/adc/da/wkflow/util/activiti/ActivitiTools.java index b26134e..bfe2cc6 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/util/activiti/ActivitiTools.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/util/activiti/ActivitiTools.java @@ -10,6 +10,9 @@ import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -177,12 +180,19 @@ public class ActivitiTools { map.put("assignee", model.getAssignee()); map.put("category", model.getCategory()); map.put("claimTime", model.getClaimTime()); - map.put("createTime", model.getCreateTime()); + LocalDateTime dt = LocalDateTime.ofInstant(model.getCreateTime().toInstant(), ZoneId.systemDefault()); + String createTime = dt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + map.put("createTime",createTime); map.put("deleteReason", model.getDeleteReason()); map.put("description", model.getDescription()); map.put("dueDate", model.getDueDate()); map.put("drationInMillis", model.getDurationInMillis()); - map.put("endTime", model.getEndTime()); + String endTime = null; + if (model.getEndTime() != null){ + LocalDateTime end = LocalDateTime.ofInstant(model.getEndTime().toInstant(), ZoneId.systemDefault()); + endTime = end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + } + map.put("endTime", endTime); map.put("executionId", model.getExecutionId()); map.put("formKey", model.getFormKey()); map.put("id", model.getId()); From 6ed1a2d06150df04828790ceef6b829e588bbcc8 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Wed, 26 Apr 2023 10:51:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=88=97=E8=A1=A8sql=20=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E8=AF=8D=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/mysql/ReportManageMapper.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 f4103a8..c455718 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 @@ -246,16 +246,20 @@ WHERE eo.DEL_FLAG = 0 - and ru.userId = #{pageVO.usid} + and (ru.userId = #{pageVO.usid} + or eo.id in ( + SELECT tt.report_id from power_apply tt WHERE tt.user_id = #{pageVO.usid}) + ) - or eo.id in ( - SELECT tt.report_id from power_apply tt WHERE tt.user_id = #{pageVO.usid} - ) + and name like CONCAT(CONCAT('%',#{pageVO.name}),'%') + + and keycontent like CONCAT(CONCAT('%',#{pageVO.keyContent}),'%') + and year in