Yaxin
/
know_sub
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化,增加报送时间字段

Browse Source
release_1.0.0
liu 8 months ago
parent 4738cf5a5b
commit 5e19b9302f
16 changed files with 92 additions and 39 deletions
Show Stats Download Patch File Download Diff File

11
know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeFlowController.java
Unescape Escape View File

@ -18,6 +18,7 @@ import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.servlet.mvc.condition.RequestConditionHolder;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@ -40,6 +41,8 @@ public class KnowledgeFlowController {
@Parameter(name = "flowType", description = "审批类型 1知识报送 2:知识撤回 3 知识删除", in = ParameterIn.QUERY),
@Parameter(name = "publishDateBegin", description = "发文时间开始", in = ParameterIn.QUERY),
@Parameter(name = "publishDateEnd", description = "发文时间结束", in = ParameterIn.QUERY),
@Parameter(name = "submitDateBegin", description = "报送时间开始", in = ParameterIn.QUERY),
@Parameter(name = "submitDateEnd", description = "报送时间结束", in = ParameterIn.QUERY),
@Parameter(name = "pageNum", description = "分页", in = ParameterIn.QUERY),
@Parameter(name = "pageSize", description = "分页", in = ParameterIn.QUERY)
})
@ -50,11 +53,13 @@ public class KnowledgeFlowController {
@RequestParam(required = false) String baseId,
@RequestParam(required = false) String submittedDeptId,
@RequestParam(required = false) Instant flowType,
@RequestParam(required = false) LocalDateTime publishDateBegin,
@RequestParam(required = false) LocalDateTime publishDateEnd,
@RequestParam(required = false) LocalDate publishDateBegin,
@RequestParam(required = false) LocalDate publishDateEnd,
@RequestParam(required = false) LocalDate submitDateBegin,
@RequestParam(required = false) LocalDate submitDateEnd,
Integer pageNum, Integer pageSize) {
return knowledgeFlowService.queryKnowledgeFlowPage(processStatus, title, publishDeptId, baseId, submittedDeptId, flowType,
publishDateBegin, publishDateEnd, pageNum, pageSize);
publishDateBegin, publishDateEnd, submitDateBegin, submitDateEnd, pageNum, pageSize);
}
@Operation(summary = "审批知识流程")

6
know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java
Unescape Escape View File

@ -38,6 +38,8 @@ public class KnowledgeManageController {
@Parameter(name = "submittedDeptId", description = "报送部门ID", in = ParameterIn.QUERY),
@Parameter(name = "publishDateBegin", description = "发文时间开始", in = ParameterIn.QUERY),
@Parameter(name = "publishDateEnd", description = "发文时间结束", in = ParameterIn.QUERY),
@Parameter(name = "submitDateBegin", description = "报送时间开始", in = ParameterIn.QUERY),
@Parameter(name = "submitDateEnd", description = "报送时间结束", in = ParameterIn.QUERY),
@Parameter(name = "pageNum", description = "分页", in = ParameterIn.QUERY),
@Parameter(name = "pageSize", description = "分页", in = ParameterIn.QUERY)
})
@ -49,8 +51,10 @@ public class KnowledgeManageController {
@RequestParam(required = false) String submittedDeptId,
@RequestParam(required = false) LocalDate publishDateBegin,
@RequestParam(required = false)LocalDate publishDateEnd,
@RequestParam(required = false) LocalDate submitDateBegin,
@RequestParam(required = false) LocalDate submitDateEnd,
Integer pageNum, Integer pageSize) {
return knowledgeManageService.queryKnowledgePage(status, title, publishDeptId, baseId, submittedDeptId, publishDateBegin, publishDateEnd, pageNum, pageSize);
return knowledgeManageService.queryKnowledgePage(status, title, publishDeptId, baseId, submittedDeptId, publishDateBegin, publishDateEnd,submitDateBegin,submitDateEnd, pageNum, pageSize);
}
@Operation(summary = "新增知识库")

3
know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeFlowService.java
Unescape Escape View File

@ -11,13 +11,14 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
public interface KnowledgeFlowService {
IPage<KnowledgeFlowResVO> queryKnowledgeFlowPage(Integer processStatus,String title, String publishDeptId, String baseId, String submitDeptId, Instant flowType,
LocalDateTime publishDateBegin, LocalDateTime publishDateEnd,
LocalDate publishDateBegin, LocalDate publishDateEnd,LocalDate submitDateBegin, LocalDate submitDateEnd,
Integer pageNum, Integer pageSize);
void submitFlowProcess(Knowledge knowledge, FlowTypeEnum flowTypeEnum, String userId, String deptId, String remark);

6
know_sub_business/src/main/java/com/supervision/knowsub/service/KnowledgeManageService.java
Unescape Escape View File

@ -21,15 +21,17 @@ public interface KnowledgeManageService {
String submitDeptId,
LocalDate publishDateBegin,
LocalDate publishDateEnd,
LocalDate submitDateBegin,
LocalDate submitDateEnd,
Integer pageNum, Integer pageSize);
void saveKnowledge(SaveKnowledgeReqVO reqVO);
void updateKnowledge(ModifyKnowledgeReqVO reqVO);
void recallKnowledge(String knowledgeId,String remark);
void recallKnowledge(String knowledgeId, String remark);
KnowledgeDetailResVO queryKnowledgeDetail(String knowledgeId);
void deleteKnowledge(String knowledgeId,String remark);
void deleteKnowledge(String knowledgeId, String remark);
}

7
know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java
Unescape Escape View File

@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@ -60,7 +61,7 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
@Override
public IPage<KnowledgeFlowResVO> queryKnowledgeFlowPage(Integer processStatus, String title, String publishDeptId, String baseId,
String submitDeptId, Instant flowType,
LocalDateTime publishDateBegin, LocalDateTime publishDateEnd,
LocalDate publishDateBegin, LocalDate publishDateEnd, LocalDate submitDateBegin, LocalDate submitDateEnd,
Integer pageNum, Integer pageSize) {
Assert.notNull(processStatus, "审批状态不能为空");
UserInfo user = UserUtil.getUser();
@ -68,12 +69,12 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
// 查询待办
if (1 == processStatus) {
result = knowledgeFlowRecordService.queryKnowledgeFlowTodoPage(user.getId(), title, publishDeptId, baseId, submitDeptId, flowType,
publishDateBegin, publishDateEnd, new Page<>(pageNum, pageSize));
publishDateBegin, publishDateEnd, submitDateBegin, submitDateEnd, new Page<>(pageNum, pageSize));
}
// 查询已办
else if (2 == processStatus) {
result = knowledgeFlowRecordService.queryKnowledgeFlowCompletePage(user.getId(), title, publishDeptId, baseId, submitDeptId, flowType,
publishDateBegin, publishDateEnd, new Page<>(pageNum, pageSize));
publishDateBegin, publishDateEnd, submitDateBegin, submitDateEnd, new Page<>(pageNum, pageSize));
} else {
throw new BusinessException("不支持的状态类型");
}

5
know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java
Unescape Escape View File

@ -58,10 +58,11 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
String baseId,
String submitDeptId,
LocalDate publishDateBegin,
LocalDate publishDateEnd, Integer pageNum, Integer pageSize) {
LocalDate publishDateEnd, LocalDate submitDateBegin,
LocalDate submitDateEnd,Integer pageNum, Integer pageSize) {
String userId = UserUtil.getUser().getId();
// 除全部可以看所有外,其他tab都是看到自己报送的知识的状态(或参与过的)
IPage<KnowledgePageResVO> knowledgeIPage = knowledgeService.queryKnowledgePage(status, title, publishDeptId, baseId, submitDeptId, publishDateBegin, publishDateEnd, userId, pageNum, pageSize);
IPage<KnowledgePageResVO> knowledgeIPage = knowledgeService.queryKnowledgePage(status, title, publishDeptId, baseId, submitDeptId, publishDateBegin, publishDateEnd,submitDateBegin,submitDateEnd, userId, pageNum, pageSize);
List<KnowledgePageResVO> records = knowledgeIPage.getRecords();
if (CollUtil.isEmpty(records)) {
return knowledgeIPage;

4
know_sub_business/src/main/java/com/supervision/knowsub/task/InvalidCheckTask.java
Unescape Escape View File

@ -20,9 +20,9 @@ public class InvalidCheckTask {
private final KnowledgeService knowledgeService;
/**
* 定时任务,每5分钟一次
* 定时任务,按天01:00执行定时任务
*/
@Scheduled(cron = "0 0/5 * * * ?")
@Scheduled(cron = "0 0 1 * * ?")
public void checkInvalidKnowledge() {
log.info("定时任务,检查是否存在过期任务");
List<CheckInvalidDTO> checkInvalidDTOS = knowledgeService.queryKnowledgeInvalidList();

13
know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeFlowRecordMapper.java
Unescape Escape View File

@ -8,6 +8,7 @@ import com.supervision.knowsub.vo.knowledge.KnowledgeFlowResVO;
import org.apache.ibatis.annotations.Param;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@ -25,8 +26,10 @@ public interface KnowledgeFlowRecordMapper extends BaseMapper<KnowledgeFlowRecor
@Param("baseId") String baseId,
@Param("submitDeptId") String submitDeptId,
@Param("flowType") Instant flowType,
@Param("publishDateBegin") LocalDateTime publishDateBegin,
@Param("publishDateEnd") LocalDateTime publishDateEnd,
@Param("publishDateBegin") LocalDate publishDateBegin,
@Param("publishDateEnd") LocalDate publishDateEnd,
@Param("submitDateBegin") LocalDate submitDateBegin,
@Param("submitDateEnd") LocalDate submitDateEnd,
Page<KnowledgeFlowResVO> page);
IPage<KnowledgeFlowResVO> queryKnowledgeFlowCompletePage(@Param("userId") String userId,
@ -35,8 +38,10 @@ public interface KnowledgeFlowRecordMapper extends BaseMapper<KnowledgeFlowRecor
@Param("baseId") String baseId,
@Param("submitDeptId") String submitDeptId,
@Param("flowType") Instant flowType,
@Param("publishDateBegin") LocalDateTime publishDateBegin,
@Param("publishDateEnd") LocalDateTime publishDateEnd,
@Param("publishDateBegin") LocalDate publishDateBegin,
@Param("publishDateEnd") LocalDate publishDateEnd,
@Param("submitDateBegin") LocalDate submitDateBegin,
@Param("submitDateEnd") LocalDate submitDateEnd,
Page<KnowledgeFlowResVO> page);
Long queryPassProcessCountByUser(@Param("userId") String userId, @Param("processStatus") Integer processStatus, @Param("knowledgeStatus") Integer knowledgeStatus);

2
know_sub_model/src/main/java/com/supervision/knowsub/mapper/KnowledgeMapper.java
Unescape Escape View File

@ -27,6 +27,8 @@ public interface KnowledgeMapper extends BaseMapper<Knowledge> {
@Param("submitDeptId") String submitDeptId,
@Param("publishDateBegin") LocalDate publishDateBegin,
@Param("publishDateEnd") LocalDate publishDateEnd,
@Param("submitDateBegin") LocalDate submitDateBegin,
@Param("submitDateEnd") LocalDate submitDateEnd,
@Param("userId") String userId, Page<Knowledge> page);
List<CheckInvalidDTO> queryKnowledgeInvalidList();

5
know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeFlowRecordService.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.supervision.knowsub.vo.knowledge.KnowledgeFlowResVO;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@ -21,7 +22,7 @@ public interface KnowledgeFlowRecordService extends IService<KnowledgeFlowRecord
*/
IPage<KnowledgeFlowResVO> queryKnowledgeFlowTodoPage(String userId, String title, String publishDeptId, String baseId,
String submitDeptId, Instant flowType,
LocalDateTime publishDateBegin, LocalDateTime publishDateEnd,
LocalDate publishDateBegin, LocalDate publishDateEnd,LocalDate submitDateBegin, LocalDate submitDateEnd,
Page<KnowledgeFlowResVO> page);
/**
@ -29,7 +30,7 @@ public interface KnowledgeFlowRecordService extends IService<KnowledgeFlowRecord
*/
IPage<KnowledgeFlowResVO> queryKnowledgeFlowCompletePage(String userId, String title, String publishDeptId, String baseId,
String submitDeptId, Instant flowType,
LocalDateTime publishDateBegin, LocalDateTime publishDateEnd,
LocalDate publishDateBegin, LocalDate publishDateEnd,LocalDate submitDateBegin, LocalDate submitDateEnd,
Page<KnowledgeFlowResVO> page);
/**

14
know_sub_model/src/main/java/com/supervision/knowsub/service/KnowledgeService.java
Unescape Escape View File

@ -11,14 +11,15 @@ import java.time.LocalDateTime;
import java.util.List;
/**
* @author Administrator
* @description 针对表【ks_knowledge(知识表)】的数据库操作Service
* @createDate 2024-06-24 11:35:15
*/
* @author Administrator
* @description 针对表【ks_knowledge(知识表)】的数据库操作Service
* @createDate 2024-06-24 11:35:15
*/
public interface KnowledgeService extends IService<Knowledge> {
/**
* 分页查询知识
*
* @param pageNum pageNum
* @param pageSize pageSize
* @return IPage<Knowledge>
@ -29,7 +30,10 @@ public interface KnowledgeService extends IService<Knowledge> {
String baseId,
String submitDeptId,
LocalDate publishDateBegin,
LocalDate publishDateEnd, String userId, Integer pageNum, Integer pageSize);
LocalDate publishDateEnd,
LocalDate submitDateBegin,
LocalDate submitDateEnd, String userId, Integer pageNum, Integer pageSize);
List<CheckInvalidDTO> queryKnowledgeInvalidList();
}

9
know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowRecordServiceImpl.java
Unescape Escape View File

@ -10,6 +10,7 @@ import com.supervision.knowsub.vo.knowledge.KnowledgeFlowResVO;
import org.springframework.stereotype.Service;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@ -23,15 +24,15 @@ public class KnowledgeFlowRecordServiceImpl extends ServiceImpl<KnowledgeFlowRec
@Override
public IPage<KnowledgeFlowResVO> queryKnowledgeFlowTodoPage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Instant flowType,
LocalDateTime publishDateBegin, LocalDateTime publishDateEnd,
LocalDate publishDateBegin, LocalDate publishDateEnd, LocalDate submitDateBegin, LocalDate submitDateEnd,
Page<KnowledgeFlowResVO> page) {
return this.baseMapper.queryKnowledgeFlowTodoPage(userId, title, publishDeptId, baseId, submitDeptId, flowType, publishDateBegin, publishDateEnd, page);
return this.baseMapper.queryKnowledgeFlowTodoPage(userId, title, publishDeptId, baseId, submitDeptId, flowType, publishDateBegin, publishDateEnd, submitDateBegin,submitDateEnd,page);
}
@Override
public IPage<KnowledgeFlowResVO> queryKnowledgeFlowCompletePage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Instant flowType,
LocalDateTime publishDateBegin, LocalDateTime publishDateEnd, Page<KnowledgeFlowResVO> page) {
return this.baseMapper.queryKnowledgeFlowCompletePage(userId, title, publishDeptId, baseId, submitDeptId, flowType, publishDateBegin, publishDateEnd, page);
LocalDate publishDateBegin, LocalDate publishDateEnd, LocalDate submitDateBegin, LocalDate submitDateEnd, Page<KnowledgeFlowResVO> page) {
return this.baseMapper.queryKnowledgeFlowCompletePage(userId, title, publishDeptId, baseId, submitDeptId, flowType, publishDateBegin, publishDateEnd,submitDateBegin,submitDateEnd, page);
}
@Override

7
know_sub_model/src/main/java/com/supervision/knowsub/service/impl/KnowledgeServiceImpl.java
Unescape Escape View File

@ -30,8 +30,11 @@ public class KnowledgeServiceImpl extends ServiceImpl<KnowledgeMapper, Knowledge
String baseId,
String submitDeptId,
LocalDate publishDateBegin,
LocalDate publishDateEnd, String userId, Integer pageNum, Integer pageSize) {
return this.baseMapper.queryKnowledgePage(status, title, publishDeptId, baseId, submitDeptId, publishDateBegin, publishDateEnd, userId, new Page<>(pageNum, pageSize));
LocalDate publishDateEnd,
LocalDate submitDateBegin,
LocalDate submitDateEnd,
String userId, Integer pageNum, Integer pageSize) {
return this.baseMapper.queryKnowledgePage(status, title, publishDeptId, baseId, submitDeptId, publishDateBegin, publishDateEnd, submitDateBegin, submitDateEnd, userId, new Page<>(pageNum, pageSize));
}
@Override

5
know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgePageResVO.java
Unescape Escape View File

@ -5,6 +5,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
@EqualsAndHashCode(callSuper = true)
@Data
public class KnowledgePageResVO extends Knowledge {
@ -30,4 +32,7 @@ public class KnowledgePageResVO extends Knowledge {
@Schema(description = "政策类型")
private String policyType;
@Schema(description = "发文时间")
private LocalDate publishDate;
}

20
know_sub_model/src/main/resources/mapper/KnowledgeFlowRecordMapper.xml
Unescape Escape View File

@ -58,12 +58,18 @@
<if test="submitDeptId != null and submitDeptId != ''">
and t2.submit_dept_id = #{submitDeptId}
</if>
<if test="publishDateBegin != null and publishDateBegin != ''">
<if test="publishDateBegin != null ">
and t3.publish_date <![CDATA[ >= ]]> #{publishDateBegin}
</if>
<if test="publishDateEnd != null and publishDateEnd != ''">
<if test="publishDateEnd != null ">
and t3.publish_date <![CDATA[ <= ]]> #{publishDateEnd}
</if>
<if test="submitDateBegin != null ">
and t2.create_time <![CDATA[ >= ]]> #{submitDateBegin}
</if>
<if test="submitDateEnd != null ">
and t2.create_time <![CDATA[ <= ]]> #{submitDateEnd}
</if>
<if test="flowType != null and flowType != ''">
and t1.flow_type = #{flowType}
</if>
@ -100,12 +106,18 @@
<if test="submitDeptId != null and submitDeptId != ''">
and t2.submit_dept_id = #{submitDeptId}
</if>
<if test="publishDateBegin != null and publishDateBegin != ''">
<if test="publishDateBegin != null">
and t3.publish_date <![CDATA[ >= ]]> #{publishDateBegin}
</if>
<if test="publishDateEnd != null and publishDateEnd != ''">
<if test="publishDateEnd != null">
and t3.publish_date <![CDATA[ <= ]]> #{publishDateEnd}
</if>
<if test="submitDateBegin != null ">
and t2.create_time <![CDATA[ >= ]]> #{submitDateBegin}
</if>
<if test="submitDateEnd != null ">
and t2.create_time <![CDATA[ <= ]]> #{submitDateEnd}
</if>
<if test="flowType != null and flowType != ''">
and t1.flow_type = #{flowType}
</if>

14
know_sub_model/src/main/resources/mapper/KnowledgeMapper.xml
Unescape Escape View File

@ -33,8 +33,8 @@
select
t1.*,
t2.policy_type as policyType,
t2.timeliness as timeliness
t2.timeliness as timeliness,
t2.publish_date as publishDate
from ks_knowledge t1 left join ks_knowledge_info t2 on t1.info_id = t2.id
<if test="status != null and status != 1">
left join (select distinct knowledge_id as submitKnowledgeId
@ -72,10 +72,16 @@
and submit_dept_id = #{submitDeptId}
</if>
<if test="publishDateBegin != null ">
and create_time <![CDATA[ >= ]]> #{publishDateBegin}
and t2.publish_date <![CDATA[ >= ]]> #{publishDateBegin}
</if>
<if test="publishDateEnd != null ">
and create_time <![CDATA[ <= ]]> #{publishDateEnd}
and t2.publish_date <![CDATA[ <= ]]> #{publishDateEnd}
</if>
<if test="submitDateBegin != null ">
and t1.create_time <![CDATA[ >= ]]> #{submitDateBegin}
</if>
<if test="submitDateEnd != null ">
and t1.create_time <![CDATA[ <= ]]> #{submitDateEnd}
</if>
order by create_time desc
</select>

Write Preview
Loading…
Cancel
Save