【工作计划】工作计划功能调整

This commit is contained in:
weizhiqiang 2022-07-06 16:52:40 +08:00
parent 8a84d3683d
commit 36eec298c4
8 changed files with 86 additions and 104 deletions

View file

@ -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<Map<String, Object>> queryEnclosureInfoListByIds(String enclosureInfoIds);
}

View file

@ -554,9 +554,15 @@ public class SysEnclosureServiceImpl implements SysEnclosureService {
public void queryEnclosureInfo(InputObject inputObject, OutputObject outputObject) {
Map<String, Object> map = inputObject.getParams();
String enclosureInfoIds = map.get("enclosureInfoIds").toString();
List<Map<String, Object>> beans = sysEnclosureDao.queryEnclosureInfo(enclosureInfoIds);
List<Map<String, Object>> beans = queryEnclosureInfoListByIds(enclosureInfoIds);
outputObject.setBeans(beans);
outputObject.settotal(beans.size());
}
@Override
public List<Map<String, Object>> queryEnclosureInfoListByIds(String enclosureInfoIds) {
List<Map<String, Object>> beans = sysEnclosureDao.queryEnclosureInfo(enclosureInfoIds);
return beans;
}
}

View file

@ -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<String> list;
/**
* 当前登陆用户id
*/
private String userId;

View file

@ -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);

View file

@ -49,8 +49,6 @@ public interface SysWorkPlanDao {
List<Map<String, Object>> querySysWorkPlanExecutorsToEditById(Map<String, Object> map);
List<Map<String, Object>> querySysWorkPlanEnclosuresToEditById(Map<String, Object> map);
int editSysWorkPlanISPeople(Map<String, Object> map);
int editSysWorkPlanTimingSend(Map<String, Object> map);
@ -61,17 +59,17 @@ public interface SysWorkPlanDao {
int insertNoticeListMation(List<Map<String, Object>> notices);
List<Map<String, Object>> queryMySysWorkPlanListByUserId(Map<String, Object> map);
List<Map<String, Object>> queryMySysWorkPlanListByUserId(SysWorkPlanQueryDo sysWorkPlanQuery);
Map<String, Object> queryMySysWorkPlanMationByUserId(@Param("planId") String planId, @Param("userId") String userId);
void subEditWorkPlanStateById(Map<String, Object> map);
List<Map<String, Object>> queryMyCreateSysWorkPlanList(Map<String, Object> map);
List<Map<String, Object>> queryMyCreateSysWorkPlanList(SysWorkPlanQueryDo sysWorkPlanQuery);
List<Map<String, Object>> queryAllSysWorkPlanList(Map<String, Object> map);
List<Map<String, Object>> queryAllSysWorkPlanList(SysWorkPlanQueryDo sysWorkPlanQuery);
List<Map<String, Object>> queryMyChildJobUserListByUserId(@Param("userId") String userId);
List<Map<String, Object>> queryMyBranchSysWorkPlanList(Map<String, Object> map);
List<Map<String, Object>> queryMyBranchSysWorkPlanList(SysWorkPlanQueryDo myBranchSysWorkPlanQuery);
}

View file

@ -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<Map<String, Object>> beans = sysWorkPlanDao.querySysWorkPlanList(sysWorkPlanQuery);
@ -495,13 +497,13 @@ public class SysWorkPlanServiceImpl implements SysWorkPlanService {
@Override
public void querySysWorkPlanToEditById(InputObject inputObject, OutputObject outputObject) {
Map<String, Object> map = inputObject.getParams();
//获取计划信息
// 获取计划信息
Map<String, Object> bean = sysWorkPlanDao.querySysWorkPlanToEditById(map);
bean.put("planCycle", WorkPlanConstants.SysWorkPlan.getClockInName(bean.get("planCycle").toString()));
//获取计划执行人信息
// 获取计划执行人信息
List<Map<String, Object>> executors = sysWorkPlanDao.querySysWorkPlanExecutorsToEditById(map);
//获取附件信息
List<Map<String, Object>> enclosures = sysWorkPlanDao.querySysWorkPlanEnclosuresToEditById(map);
// 获取附件信息
List<Map<String, Object>> 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<Map<String, Object>> executors = sysWorkPlanDao.querySysWorkPlanExecutorsToEditById(map);
//获取附件信息
List<Map<String, Object>> enclosures = sysWorkPlanDao.querySysWorkPlanEnclosuresToEditById(map);
List<Map<String, Object>> 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<String, Object> 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<Map<String, Object>> 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<Map<String, Object>> 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<String, Object> 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<Map<String, Object>> 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<Map<String, Object>> 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<String, Object> map = inputObject.getParams();
Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString()));
List<Map<String, Object>> beans = sysWorkPlanDao.queryAllSysWorkPlanList(map);
SysWorkPlanQueryDo sysWorkPlanQuery = inputObject.getParams(SysWorkPlanQueryDo.class);
Page pages = PageHelper.startPage(sysWorkPlanQuery.getPage(), sysWorkPlanQuery.getLimit());
List<Map<String, Object>> 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<String, Object> map = inputObject.getParams();
SysWorkPlanQueryDo sysWorkPlanQuery = inputObject.getParams(SysWorkPlanQueryDo.class);
String userId = inputObject.getLogParams().get("id").toString();
// 获取我的下属职位员工
List<Map<String, Object>> jobChildUser = sysWorkPlanDao.queryMyChildJobUserListByUserId(userId);
if (jobChildUser != null && !jobChildUser.isEmpty()) {
List<String> 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<Map<String, Object>> beans = sysWorkPlanDao.queryMyBranchSysWorkPlanList(map);
sysWorkPlanQuery.setList(jodUserId);
Page pages = PageHelper.startPage(sysWorkPlanQuery.getPage(), sysWorkPlanQuery.getLimit());
List<Map<String, Object>> beans = sysWorkPlanDao.queryMyBranchSysWorkPlanList(sysWorkPlanQuery);
outputObject.setBeans(beans);
outputObject.settotal(pages.getTotal());
}

View file

@ -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})
<if test="title != '' and title != null">
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
</select>
<select id="querySysWorkPlanEnclosuresToEditById" parameterType="java.util.Map" resultType="java.util.Map">
SELECT
a.id,
a.file_name `name`,
a.file_address fileAddress
FROM
sys_enclosure a,
sys_work_plan b
WHERE
INSTR(CONCAT(',', b.enclosure_info, ','), CONCAT(',', a.id, ','))
AND b.id = #{id}
</select>
<update id="editSysWorkPlanISPeople" parameterType="java.util.Map">
UPDATE sys_work_plan
<set>
@ -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 @@
</foreach>
</insert>
<select id="queryMySysWorkPlanListByUserId" parameterType="java.util.Map" resultType="java.util.Map">
<select id="queryMySysWorkPlanListByUserId" resultType="java.util.Map">
SELECT
a.id,
a.title,
@ -304,7 +293,7 @@
AND user_id = #{userId}
</update>
<select id="queryMyCreateSysWorkPlanList" parameterType="java.util.Map" resultType="java.util.Map">
<select id="queryMyCreateSysWorkPlanList" resultType="java.util.Map">
SELECT
a.id,
a.title,
@ -348,7 +337,7 @@
ORDER BY a.start_time DESC
</select>
<select id="queryAllSysWorkPlanList" parameterType="java.util.Map" resultType="java.util.Map">
<select id="queryAllSysWorkPlanList" resultType="java.util.Map">
SELECT
a.id,
a.title,

View file

@ -100,53 +100,11 @@
<property id="whetherTime" name="whetherTime" ref="required,num" var="是否定时通知 1.是 2.否"/>
<property id="notifyTime" name="notifyTime" ref="" var="定时通知时间"/>
</url>
<url id="sysworkplan013" path="/post/SysWorkPlanController/queryMySysWorkPlanListByUserId" val="获取我的任务计划列表" allUse="1">
<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
<property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
<property id="title" name="title" ref="" var="计划标题"/>
<property id="userName" name="userName" ref="" var="计划下达人"/>
<property id="state" name="state" ref="num" var="执行状态"/>
<property id="planType" name="planType" ref="num" var="计划类型 1.个人计划 2.部门计划 3.公司计划"/>
<property id="planCycle" name="planCycle" ref="num" var="计划周期类型 1.日计划 2.周计划 3.月计划 4.季度计划 5.半年计划 6.年计划"/>
<property id="startTime" name="startTime" ref="date" var="开始时间"/>
<property id="endTime" name="endTime" ref="date" var="结束时间"/>
</url>
<url id="sysworkplan014" path="/post/SysWorkPlanController/subEditWorkPlanStateById" val="计划状态变更" allUse="1">
<property id="rowId" name="id" ref="required" var="计划id" />
<property id="state" name="state" ref="required,num" var="状态"/>
<property id="remark" name="remark" ref="" var="备注"/>
</url>
<url id="sysworkplan015" path="/post/SysWorkPlanController/queryMyCreateSysWorkPlanList" val="获取我创建的任务计划列表" allUse="1">
<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
<property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
<property id="title" name="title" ref="" var="计划标题"/>
<property id="planType" name="planType" ref="num" var="计划类型 1.个人计划 2.部门计划 3.公司计划"/>
<property id="planCycle" name="planCycle" ref="num" var="计划周期类型 1.日计划 2.周计划 3.月计划 4.季度计划 5.半年计划 6.年计划"/>
<property id="startTime" name="startTime" ref="date" var="开始时间"/>
<property id="endTime" name="endTime" ref="date" var="结束时间"/>
</url>
<url id="sysworkplan016" path="/post/SysWorkPlanController/queryAllSysWorkPlanList" val="获取所有任务计划列表" allUse="1">
<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
<property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
<property id="title" name="title" ref="" var="计划标题"/>
<property id="userName" name="userName" ref="" var="计划下达人"/>
<property id="planType" name="planType" ref="num" var="计划类型 1.个人计划 2.部门计划 3.公司计划"/>
<property id="planCycle" name="planCycle" ref="num" var="计划周期类型 1.日计划 2.周计划 3.月计划 4.季度计划 5.半年计划 6.年计划"/>
<property id="startTime" name="startTime" ref="date" var="开始时间"/>
<property id="endTime" name="endTime" ref="date" var="结束时间"/>
</url>
<url id="sysworkplan017" path="/post/SysWorkPlanController/queryMyBranchSysWorkPlanList" val="获取我的下属的任务计划列表" allUse="1">
<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
<property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
<property id="title" name="title" ref="" var="计划标题"/>
<property id="userName" name="userName" ref="" var="计划下达人"/>
<property id="executorName" name="executorName" ref="" var="计划执行人"/>
<property id="state" name="state" ref="num" var="执行状态"/>
<property id="planType" name="planType" ref="num" var="计划类型 1.个人计划 2.部门计划 3.公司计划"/>
<property id="planCycle" name="planCycle" ref="num" var="计划周期类型 1.日计划 2.周计划 3.月计划 4.季度计划 5.半年计划 6.年计划"/>
<property id="startTime" name="startTime" ref="date" var="开始时间"/>
<property id="endTime" name="endTime" ref="date" var="结束时间"/>
</url>
<!-- 工作计划模块结束 -->
</controller>