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

bugfix:修复知识审批类型不生效的问题

Browse Source
release_1.0.0
liu 10 months ago
parent 44b95e8198
commit c52e90207c
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

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

@ -52,7 +52,7 @@ public class KnowledgeFlowController {
@RequestParam(required = false) String publishDeptId, @RequestParam(required = false) String publishDeptId,
@RequestParam(required = false) String baseId, @RequestParam(required = false) String baseId,
@RequestParam(required = false) String submittedDeptId, @RequestParam(required = false) String submittedDeptId,
@RequestParam(required = false) Instant flowType, @RequestParam(required = false) Integer flowType,
@RequestParam(required = false) LocalDate publishDateBegin, @RequestParam(required = false) LocalDate publishDateBegin,
@RequestParam(required = false) LocalDate publishDateEnd, @RequestParam(required = false) LocalDate publishDateEnd,
@RequestParam(required = false) LocalDate submitDateBegin, @RequestParam(required = false) LocalDate submitDateBegin,

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

@ -17,7 +17,7 @@ import java.util.List;
public interface KnowledgeFlowService { public interface KnowledgeFlowService {
IPage<KnowledgeFlowResVO> queryKnowledgeFlowPage(Integer processStatus,String title, String publishDeptId, String baseId, String submitDeptId, Instant flowType, IPage<KnowledgeFlowResVO> queryKnowledgeFlowPage(Integer processStatus,String title, String publishDeptId, String baseId, String submitDeptId, Integer flowType,
LocalDate publishDateBegin, LocalDate publishDateEnd,LocalDate submitDateBegin, LocalDate submitDateEnd, LocalDate publishDateBegin, LocalDate publishDateEnd,LocalDate submitDateBegin, LocalDate submitDateEnd,
Integer pageNum, Integer pageSize); Integer pageNum, Integer pageSize);

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

@ -60,7 +60,7 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
@Override @Override
public IPage<KnowledgeFlowResVO> queryKnowledgeFlowPage(Integer processStatus, String title, String publishDeptId, String baseId, public IPage<KnowledgeFlowResVO> queryKnowledgeFlowPage(Integer processStatus, String title, String publishDeptId, String baseId,
String submitDeptId, Instant flowType, String submitDeptId, Integer flowType,
LocalDate publishDateBegin, LocalDate publishDateEnd, LocalDate submitDateBegin, LocalDate submitDateEnd, LocalDate publishDateBegin, LocalDate publishDateEnd, LocalDate submitDateBegin, LocalDate submitDateEnd,
Integer pageNum, Integer pageSize) { Integer pageNum, Integer pageSize) {
Assert.notNull(processStatus, "审批状态不能为空"); Assert.notNull(processStatus, "审批状态不能为空");

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

@ -25,7 +25,7 @@ public interface KnowledgeFlowRecordMapper extends BaseMapper<KnowledgeFlowRecor
@Param("publishDeptId") String publishDeptId, @Param("publishDeptId") String publishDeptId,
@Param("baseId") String baseId, @Param("baseId") String baseId,
@Param("submitDeptId") String submitDeptId, @Param("submitDeptId") String submitDeptId,
@Param("flowType") Instant flowType, @Param("flowType") Integer flowType,
@Param("publishDateBegin") LocalDate publishDateBegin, @Param("publishDateBegin") LocalDate publishDateBegin,
@Param("publishDateEnd") LocalDate publishDateEnd, @Param("publishDateEnd") LocalDate publishDateEnd,
@Param("submitDateBegin") LocalDate submitDateBegin, @Param("submitDateBegin") LocalDate submitDateBegin,
@ -37,7 +37,7 @@ public interface KnowledgeFlowRecordMapper extends BaseMapper<KnowledgeFlowRecor
@Param("publishDeptId") String publishDeptId, @Param("publishDeptId") String publishDeptId,
@Param("baseId") String baseId, @Param("baseId") String baseId,
@Param("submitDeptId") String submitDeptId, @Param("submitDeptId") String submitDeptId,
@Param("flowType") Instant flowType, @Param("flowType") Integer flowType,
@Param("publishDateBegin") LocalDate publishDateBegin, @Param("publishDateBegin") LocalDate publishDateBegin,
@Param("publishDateEnd") LocalDate publishDateEnd, @Param("publishDateEnd") LocalDate publishDateEnd,
@Param("submitDateBegin") LocalDate submitDateBegin, @Param("submitDateBegin") LocalDate submitDateBegin,

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

@ -21,7 +21,7 @@ public interface KnowledgeFlowRecordService extends IService<KnowledgeFlowRecord
* 查询待办 * 查询待办
*/ */
IPage<KnowledgeFlowResVO> queryKnowledgeFlowTodoPage(String userId, String title, String publishDeptId, String baseId, IPage<KnowledgeFlowResVO> queryKnowledgeFlowTodoPage(String userId, String title, String publishDeptId, String baseId,
String submitDeptId, Instant flowType, String submitDeptId, Integer flowType,
LocalDate publishDateBegin, LocalDate publishDateEnd,LocalDate submitDateBegin, LocalDate submitDateEnd, LocalDate publishDateBegin, LocalDate publishDateEnd,LocalDate submitDateBegin, LocalDate submitDateEnd,
Page<KnowledgeFlowResVO> page); Page<KnowledgeFlowResVO> page);
@ -29,7 +29,7 @@ public interface KnowledgeFlowRecordService extends IService<KnowledgeFlowRecord
* 查询已办 * 查询已办
*/ */
IPage<KnowledgeFlowResVO> queryKnowledgeFlowCompletePage(String userId, String title, String publishDeptId, String baseId, IPage<KnowledgeFlowResVO> queryKnowledgeFlowCompletePage(String userId, String title, String publishDeptId, String baseId,
String submitDeptId, Instant flowType, String submitDeptId, Integer flowType,
LocalDate publishDateBegin, LocalDate publishDateEnd,LocalDate submitDateBegin, LocalDate submitDateEnd, LocalDate publishDateBegin, LocalDate publishDateEnd,LocalDate submitDateBegin, LocalDate submitDateEnd,
Page<KnowledgeFlowResVO> page); Page<KnowledgeFlowResVO> page);

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

@ -23,14 +23,14 @@ public class KnowledgeFlowRecordServiceImpl extends ServiceImpl<KnowledgeFlowRec
implements KnowledgeFlowRecordService { implements KnowledgeFlowRecordService {
@Override @Override
public IPage<KnowledgeFlowResVO> queryKnowledgeFlowTodoPage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Instant flowType, public IPage<KnowledgeFlowResVO> queryKnowledgeFlowTodoPage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Integer flowType,
LocalDate publishDateBegin, LocalDate publishDateEnd, LocalDate submitDateBegin, LocalDate submitDateEnd, LocalDate publishDateBegin, LocalDate publishDateEnd, LocalDate submitDateBegin, LocalDate submitDateEnd,
Page<KnowledgeFlowResVO> page) { Page<KnowledgeFlowResVO> page) {
return this.baseMapper.queryKnowledgeFlowTodoPage(userId, title, publishDeptId, baseId, submitDeptId, flowType, publishDateBegin, publishDateEnd, submitDateBegin,submitDateEnd,page); return this.baseMapper.queryKnowledgeFlowTodoPage(userId, title, publishDeptId, baseId, submitDeptId, flowType, publishDateBegin, publishDateEnd, submitDateBegin,submitDateEnd,page);
} }
@Override @Override
public IPage<KnowledgeFlowResVO> queryKnowledgeFlowCompletePage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Instant flowType, public IPage<KnowledgeFlowResVO> queryKnowledgeFlowCompletePage(String userId, String title, String publishDeptId, String baseId, String submitDeptId, Integer flowType,
LocalDate publishDateBegin, LocalDate publishDateEnd, LocalDate submitDateBegin, LocalDate submitDateEnd, Page<KnowledgeFlowResVO> 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); return this.baseMapper.queryKnowledgeFlowCompletePage(userId, title, publishDeptId, baseId, submitDeptId, flowType, publishDateBegin, publishDateEnd,submitDateBegin,submitDateEnd, page);
} }

2
know_sub_model/src/main/java/com/supervision/knowsub/vo/knowledge/KnowledgeFlowResVO.java
Unescape Escape View File

@ -23,7 +23,7 @@ public class KnowledgeFlowResVO {
private String flowType; private String flowType;
@Schema(description = "发文部门名称") @Schema(description = "发文部门名称")
private String publishDeptName; private String publishDeptName;
@Schema(description = "流转状态 1草稿 2通过 3驳回 4已撤回 5已失效 6已删除 10待审批(新增) 11待审批(删除) 12待审批(撤回)") @Schema(description = "流转状态 1草稿 2通过 3驳回 4已撤回 5已失效 6已删除 10待审批(新增) 11待审批(删除) 12待审批(撤回) 15驳回(新增) 16驳回(删除) 17驳回(撤回)")
private Integer status; private Integer status;
private String publishDeptId; private String publishDeptId;

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

@ -74,7 +74,7 @@
<if test="submitDateEnd != null "> <if test="submitDateEnd != null ">
and t2.create_time <![CDATA[ <= ]]> #{submitDateEnd} and t2.create_time <![CDATA[ <= ]]> #{submitDateEnd}
</if> </if>
<if test="flowType != null and flowType != ''"> <if test="flowType != null ">
and t1.flow_type = #{flowType} and t1.flow_type = #{flowType}
</if> </if>
</where> </where>
@ -126,7 +126,7 @@
<if test="submitDateEnd != null "> <if test="submitDateEnd != null ">
and t2.create_time <![CDATA[ <= ]]> #{submitDateEnd} and t2.create_time <![CDATA[ <= ]]> #{submitDateEnd}
</if> </if>
<if test="flowType != null and flowType != ''"> <if test="flowType != null ">
and t1.flow_type = #{flowType} and t1.flow_type = #{flowType}
</if> </if>
</where> </where>

Write Preview
Loading…
Cancel
Save