From 36eec298c4f5a4342921245bb763e197d2fd9ab7 Mon Sep 17 00:00:00 2001 From: weizhiqiang <> Date: Wed, 6 Jul 2022 16:52:40 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E3=80=91=E5=B7=A5=E4=BD=9C=E8=AE=A1=E5=88=92=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eve/service/SysEnclosureService.java | 11 +++++ .../service/impl/SysEnclosureServiceImpl.java | 8 +++- .../entity/workplan/SysWorkPlanQueryDo.java | 40 ++++++++++------ .../eve/controller/SysWorkPlanController.java | 8 ++++ .../com/skyeye/eve/dao/SysWorkPlanDao.java | 10 ++-- .../service/impl/SysWorkPlanServiceImpl.java | 46 ++++++++++--------- .../mapper/workplan/SysWorkPlanMapper.xml | 25 +++------- .../resources/reqmapping/mapping/workplan.xml | 42 ----------------- 8 files changed, 86 insertions(+), 104 deletions(-) diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java index dccdcf13..927d5c3b 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/SysEnclosureService.java @@ -7,6 +7,9 @@ package com.skyeye.eve.service; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; +import java.util.List; +import java.util.Map; + public interface SysEnclosureService { void querySysEnclosureListByUserId(InputObject inputObject, OutputObject outputObject); @@ -45,4 +48,12 @@ public interface SysEnclosureService { void queryEnclosureInfo(InputObject inputObject, OutputObject outputObject); + /** + * 根据ids(逗号隔开)获取多个附件信息 + * + * @param enclosureInfoIds ids(逗号隔开) + * @return + */ + List> queryEnclosureInfoListByIds(String enclosureInfoIds); + } diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java index c0802e15..d10a2769 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/eve/service/impl/SysEnclosureServiceImpl.java @@ -554,9 +554,15 @@ public class SysEnclosureServiceImpl implements SysEnclosureService { public void queryEnclosureInfo(InputObject inputObject, OutputObject outputObject) { Map map = inputObject.getParams(); String enclosureInfoIds = map.get("enclosureInfoIds").toString(); - List> beans = sysEnclosureDao.queryEnclosureInfo(enclosureInfoIds); + List> beans = queryEnclosureInfoListByIds(enclosureInfoIds); outputObject.setBeans(beans); outputObject.settotal(beans.size()); } + @Override + public List> queryEnclosureInfoListByIds(String enclosureInfoIds) { + List> beans = sysEnclosureDao.queryEnclosureInfo(enclosureInfoIds); + return beans; + } + } diff --git a/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/workplan/SysWorkPlanQueryDo.java b/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/workplan/SysWorkPlanQueryDo.java index 32f8c974..1c8c7ebc 100644 --- a/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/workplan/SysWorkPlanQueryDo.java +++ b/skyeye-promote/skyeye-entity/src/main/java/com/skyeye/eve/entity/workplan/SysWorkPlanQueryDo.java @@ -10,12 +10,13 @@ import com.skyeye.common.entity.CommonPageInfo; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @ClassName: SysWorkPlanQueryDo * @Description: 工作计划列表查询条件实体类 * @author: skyeye云系列--卫志强 - * @date: 2022/6/30 22:41 + * @date: 2022/7/6 22:41 * @Copyright: 2022 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 */ @@ -23,28 +24,37 @@ import java.io.Serializable; @ApiModel("工作计划列表查询条件实体类") public class SysWorkPlanQueryDo extends CommonPageInfo implements Serializable { - @ApiModelProperty(value = "当前选择的计划分类，个人计划，部门计划，公司计划", required = "required,num") - private Integer checkPlan; - - @ApiModelProperty(value = "计划类型，日计划，周计划等", required = "required") - private String nowCheckType; - - /** - * 计划类型对应的数字 - */ - private String nowCheckTypeNum; - @ApiModelProperty(value = "计划标题") private String title; - @ApiModelProperty(value = "开始时间", required = "required,date") + @ApiModelProperty(value = "计划下达人") + private String userName; + + @ApiModelProperty(value = "计划执行人") + private String executorName; + + @ApiModelProperty(value = "执行状态", required = "num") + private Integer state; + + @ApiModelProperty(value = "计划类型 1.个人计划 2.部门计划 3.公司计划", required = "num") + private Integer planType; + + @ApiModelProperty(value = "计划周期类型 1.日计划 2.周计划 3.月计划 4.季度计划 5.半年计划 6.年计划", required = "num") + private Integer planCycle; + + @ApiModelProperty(value = "开始时间", required = "date") private String startTime; - @ApiModelProperty(value = "结束时间", required = "required,date") + @ApiModelProperty(value = "结束时间", required = "date") private String endTime; /** - * 用户id + * 我下属的用户id + */ + private List list; + + /** + * 当前登陆用户id */ private String userId; diff --git a/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/controller/SysWorkPlanController.java b/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/controller/SysWorkPlanController.java index 841b3f29..49f05f90 100644 --- a/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/controller/SysWorkPlanController.java +++ b/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/controller/SysWorkPlanController.java @@ -159,6 +159,8 @@ public class SysWorkPlanController { * @param inputObject * @param outputObject */ + @ApiOperation(id = "sysworkplan013", value = "获取我的任务计划列表", method = "POST", allUse = "1") + @ApiImplicitParams(classBean = SysWorkPlanQueryDo.class) @RequestMapping("/post/SysWorkPlanController/queryMySysWorkPlanListByUserId") public void queryMySysWorkPlanListByUserId(InputObject inputObject, OutputObject outputObject) { sysWorkPlanService.queryMySysWorkPlanListByUserId(inputObject, outputObject); @@ -181,6 +183,8 @@ public class SysWorkPlanController { * @param inputObject * @param outputObject */ + @ApiOperation(id = "sysworkplan015", value = "获取我创建的任务计划列表", method = "POST", allUse = "1") + @ApiImplicitParams(classBean = SysWorkPlanQueryDo.class) @RequestMapping("/post/SysWorkPlanController/queryMyCreateSysWorkPlanList") public void queryMyCreateSysWorkPlanList(InputObject inputObject, OutputObject outputObject) { sysWorkPlanService.queryMyCreateSysWorkPlanList(inputObject, outputObject); @@ -192,6 +196,8 @@ public class SysWorkPlanController { * @param inputObject * @param outputObject */ + @ApiOperation(id = "sysworkplan016", value = "获取所有任务计划列表", method = "POST", allUse = "1") + @ApiImplicitParams(classBean = SysWorkPlanQueryDo.class) @RequestMapping("/post/SysWorkPlanController/queryAllSysWorkPlanList") public void queryAllSysWorkPlanList(InputObject inputObject, OutputObject outputObject) { sysWorkPlanService.queryAllSysWorkPlanList(inputObject, outputObject); @@ -203,6 +209,8 @@ public class SysWorkPlanController { * @param inputObject * @param outputObject */ + @ApiOperation(id = "sysworkplan017", value = "获取我的下属的任务计划列表", method = "POST", allUse = "1") + @ApiImplicitParams(classBean = SysWorkPlanQueryDo.class) @RequestMapping("/post/SysWorkPlanController/queryMyBranchSysWorkPlanList") public void queryMyBranchSysWorkPlanList(InputObject inputObject, OutputObject outputObject) { sysWorkPlanService.queryMyBranchSysWorkPlanList(inputObject, outputObject); diff --git a/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/dao/SysWorkPlanDao.java b/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/dao/SysWorkPlanDao.java index d48ffde8..07ff2ea7 100644 --- a/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/dao/SysWorkPlanDao.java +++ b/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/dao/SysWorkPlanDao.java @@ -49,8 +49,6 @@ public interface SysWorkPlanDao { List> querySysWorkPlanExecutorsToEditById(Map map); - List> querySysWorkPlanEnclosuresToEditById(Map map); - int editSysWorkPlanISPeople(Map map); int editSysWorkPlanTimingSend(Map map); @@ -61,17 +59,17 @@ public interface SysWorkPlanDao { int insertNoticeListMation(List> notices); - List> queryMySysWorkPlanListByUserId(Map map); + List> queryMySysWorkPlanListByUserId(SysWorkPlanQueryDo sysWorkPlanQuery); Map queryMySysWorkPlanMationByUserId(@Param("planId") String planId, @Param("userId") String userId); void subEditWorkPlanStateById(Map map); - List> queryMyCreateSysWorkPlanList(Map map); + List> queryMyCreateSysWorkPlanList(SysWorkPlanQueryDo sysWorkPlanQuery); - List> queryAllSysWorkPlanList(Map map); + List> queryAllSysWorkPlanList(SysWorkPlanQueryDo sysWorkPlanQuery); List> queryMyChildJobUserListByUserId(@Param("userId") String userId); - List> queryMyBranchSysWorkPlanList(Map map); + List> queryMyBranchSysWorkPlanList(SysWorkPlanQueryDo myBranchSysWorkPlanQuery); } diff --git a/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/service/impl/SysWorkPlanServiceImpl.java b/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/service/impl/SysWorkPlanServiceImpl.java index 8b212061..1227b8f9 100644 --- a/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/service/impl/SysWorkPlanServiceImpl.java +++ b/skyeye-promote/skyeye-workplan/src/main/java/com/skyeye/eve/service/impl/SysWorkPlanServiceImpl.java @@ -19,6 +19,7 @@ import com.skyeye.eve.dao.ScheduleDayDao; import com.skyeye.eve.dao.SysWorkPlanDao; import com.skyeye.eve.entity.workplan.SysWorkPlanQueryDo; import com.skyeye.eve.service.ScheduleDayService; +import com.skyeye.eve.service.SysEnclosureService; import com.skyeye.eve.service.SysWorkPlanService; import com.skyeye.quartz.config.QuartzService; import com.skyeye.service.JobMateMationService; @@ -58,6 +59,9 @@ public class SysWorkPlanServiceImpl implements SysWorkPlanService { @Autowired private JobMateMationService jobMateMationService; + @Autowired + private SysEnclosureService sysEnclosureService; + private static final String MESSAGE_TITLE = "计划提醒"; /** @@ -94,8 +98,6 @@ public class SysWorkPlanServiceImpl implements SysWorkPlanService { @Override public void querySysWorkPlanList(InputObject inputObject, OutputObject outputObject) { SysWorkPlanQueryDo sysWorkPlanQuery = inputObject.getParams(SysWorkPlanQueryDo.class); - // 转化计划周期类型为数字 - sysWorkPlanQuery.setNowCheckTypeNum(WorkPlanConstants.SysWorkPlan.getClockInState(sysWorkPlanQuery.getNowCheckType())); sysWorkPlanQuery.setUserId(inputObject.getLogParams().get("id").toString()); Page pages = PageHelper.startPage(sysWorkPlanQuery.getPage(), sysWorkPlanQuery.getLimit()); List> beans = sysWorkPlanDao.querySysWorkPlanList(sysWorkPlanQuery); @@ -495,13 +497,13 @@ public class SysWorkPlanServiceImpl implements SysWorkPlanService { @Override public void querySysWorkPlanToEditById(InputObject inputObject, OutputObject outputObject) { Map map = inputObject.getParams(); - //获取计划信息 + // 获取计划信息 Map bean = sysWorkPlanDao.querySysWorkPlanToEditById(map); bean.put("planCycle", WorkPlanConstants.SysWorkPlan.getClockInName(bean.get("planCycle").toString())); - //获取计划执行人信息 + // 获取计划执行人信息 List> executors = sysWorkPlanDao.querySysWorkPlanExecutorsToEditById(map); - //获取附件信息 - List> enclosures = sysWorkPlanDao.querySysWorkPlanEnclosuresToEditById(map); + // 获取附件信息 + List> enclosures = sysEnclosureService.queryEnclosureInfoListByIds(bean.get("enclosureInfo").toString()); bean.put("executors", executors); bean.put("enclosures", enclosures); outputObject.setBean(bean); @@ -667,7 +669,7 @@ public class SysWorkPlanServiceImpl implements SysWorkPlanService { //获取计划执行人信息 List> executors = sysWorkPlanDao.querySysWorkPlanExecutorsToEditById(map); //获取附件信息 - List> enclosures = sysWorkPlanDao.querySysWorkPlanEnclosuresToEditById(map); + List> enclosures = sysEnclosureService.queryEnclosureInfoListByIds(bean.get("enclosureInfo").toString()); bean.put("executors", executors); bean.put("enclosures", enclosures); outputObject.setBean(bean); @@ -685,10 +687,10 @@ public class SysWorkPlanServiceImpl implements SysWorkPlanService { */ @Override public void queryMySysWorkPlanListByUserId(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - map.put("userId", inputObject.getLogParams().get("id")); - Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString())); - List> beans = sysWorkPlanDao.queryMySysWorkPlanListByUserId(map); + SysWorkPlanQueryDo sysWorkPlanQuery = inputObject.getParams(SysWorkPlanQueryDo.class); + sysWorkPlanQuery.setUserId(inputObject.getLogParams().get("id").toString()); + Page pages = PageHelper.startPage(sysWorkPlanQuery.getPage(), sysWorkPlanQuery.getLimit()); + List> beans = sysWorkPlanDao.queryMySysWorkPlanListByUserId(sysWorkPlanQuery); outputObject.setBeans(beans); outputObject.settotal(pages.getTotal()); } @@ -722,10 +724,10 @@ public class SysWorkPlanServiceImpl implements SysWorkPlanService { */ @Override public void queryMyCreateSysWorkPlanList(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - map.put("userId", inputObject.getLogParams().get("id")); - Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString())); - List> beans = sysWorkPlanDao.queryMyCreateSysWorkPlanList(map); + SysWorkPlanQueryDo sysWorkPlanQuery = inputObject.getParams(SysWorkPlanQueryDo.class); + sysWorkPlanQuery.setUserId(inputObject.getLogParams().get("id").toString()); + Page pages = PageHelper.startPage(sysWorkPlanQuery.getPage(), sysWorkPlanQuery.getLimit()); + List> beans = sysWorkPlanDao.queryMyCreateSysWorkPlanList(sysWorkPlanQuery); outputObject.setBeans(beans); outputObject.settotal(pages.getTotal()); } @@ -738,9 +740,9 @@ public class SysWorkPlanServiceImpl implements SysWorkPlanService { */ @Override public void queryAllSysWorkPlanList(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString())); - List> beans = sysWorkPlanDao.queryAllSysWorkPlanList(map); + SysWorkPlanQueryDo sysWorkPlanQuery = inputObject.getParams(SysWorkPlanQueryDo.class); + Page pages = PageHelper.startPage(sysWorkPlanQuery.getPage(), sysWorkPlanQuery.getLimit()); + List> beans = sysWorkPlanDao.queryAllSysWorkPlanList(sysWorkPlanQuery); outputObject.setBeans(beans); outputObject.settotal(pages.getTotal()); } @@ -753,15 +755,15 @@ public class SysWorkPlanServiceImpl implements SysWorkPlanService { */ @Override public void queryMyBranchSysWorkPlanList(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); + SysWorkPlanQueryDo sysWorkPlanQuery = inputObject.getParams(SysWorkPlanQueryDo.class); String userId = inputObject.getLogParams().get("id").toString(); // 获取我的下属职位员工 List> jobChildUser = sysWorkPlanDao.queryMyChildJobUserListByUserId(userId); if (jobChildUser != null && !jobChildUser.isEmpty()) { List jodUserId = jobChildUser.stream().map(p -> p.get("user_id").toString()).collect(Collectors.toList()); - map.put("list", jodUserId); - Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString())); - List> beans = sysWorkPlanDao.queryMyBranchSysWorkPlanList(map); + sysWorkPlanQuery.setList(jodUserId); + Page pages = PageHelper.startPage(sysWorkPlanQuery.getPage(), sysWorkPlanQuery.getLimit()); + List> beans = sysWorkPlanDao.queryMyBranchSysWorkPlanList(sysWorkPlanQuery); outputObject.setBeans(beans); outputObject.settotal(pages.getTotal()); } diff --git a/skyeye-promote/skyeye-workplan/src/main/resources/mapper/workplan/SysWorkPlanMapper.xml b/skyeye-promote/skyeye-workplan/src/main/resources/mapper/workplan/SysWorkPlanMapper.xml index a38ef8e6..90c2d844 100644 --- a/skyeye-promote/skyeye-workplan/src/main/resources/mapper/workplan/SysWorkPlanMapper.xml +++ b/skyeye-promote/skyeye-workplan/src/main/resources/mapper/workplan/SysWorkPlanMapper.xml @@ -21,8 +21,8 @@ LEFT JOIN sys_eve_user_staff b ON a.create_id = b.user_id, sys_work_plan_executor c WHERE a.id = c.plan_id - AND a.plan_type = #{checkPlan} - AND a.plan_cycle = #{nowCheckTypeNum} + AND a.plan_type = #{planType} + AND a.plan_cycle = #{planCycle} AND (c.user_id = #{userId} OR a.create_id = #{userId}) AND a.title LIKE '%${title}%' @@ -122,6 +122,7 @@ a.content, a.plan_cycle planCycle, a.plan_type planType, + IFNULL(a.enclosure_info) enclosureInfo, a.assignment_type assignmentType, DATE_FORMAT(a.start_time, '%Y-%m-%d') startTime, DATE_FORMAT(a.end_time, '%Y-%m-%d') endTime, @@ -147,19 +148,6 @@ AND a.user_id = b.user_id - - UPDATE sys_work_plan @@ -191,6 +179,7 @@ a.content, a.plan_cycle planCycle, a.plan_type planType, + IFNULL(a.enclosure_info) enclosureInfo, DATE_FORMAT(a.create_time, '%Y-%m-%d') createTime, CASE a.whether_mail WHEN '1' THEN '是' WHEN '2' THEN '否' ELSE '否' END whetherMail, CASE a.whether_notice WHEN '1' THEN '是' WHEN '2' THEN '否' ELSE '否' END whetherNotice, @@ -231,7 +220,7 @@ - SELECT a.id, a.title, @@ -304,7 +293,7 @@ AND user_id = #{userId} - SELECT a.id, a.title, @@ -348,7 +337,7 @@ ORDER BY a.start_time DESC - SELECT a.id, a.title, diff --git a/skyeye-promote/skyeye-workplan/src/main/resources/reqmapping/mapping/workplan.xml b/skyeye-promote/skyeye-workplan/src/main/resources/reqmapping/mapping/workplan.xml index a9cee28f..3efb5b79 100644 --- a/skyeye-promote/skyeye-workplan/src/main/resources/reqmapping/mapping/workplan.xml +++ b/skyeye-promote/skyeye-workplan/src/main/resources/reqmapping/mapping/workplan.xml @@ -100,53 +100,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file