接口调整

blade-service/blade-business/src/main/java/org/springblade/business/controller/ContractLogController.java

@@ -53,13 +53,19 @@ public class ContractLogController extends BladeController {
 
 	/**
 	 * 获取当前日志类型的填报人
-	 * @param logVo 查询条件
 	 * @return 结果
 	 */
 	@GetMapping("/queryFillUser")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "获取当前日志类型的填报人")
-	public R<List<FileUserVO>> queryFillUser(@RequestBody ContractLogVO logVo){
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "wbsNodeId", value = "分类列表的primaryKeyId", required = true),
+			@ApiImplicitParam(name = "contractId", value = "合同段ID", required = true)
+	})
+	public R<List<FileUserVO>> queryFillUser(@RequestParam Long primaryKeyId, @RequestParam Long contractId){
+		ContractLogVO logVo = new ContractLogVO();
+		logVo.setWbsNodeId(primaryKeyId);
+		logVo.setContractId(contractId);
 		return R.data(this.contractLogService.queryFillUser(logVo));
 	}
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ContractLogMapper.java

@@ -37,9 +37,4 @@ public interface ContractLogMapper extends BaseMapper<ContractLog> {
 
 	Integer selectPageCount(@Param("vo") ContractLogVO vo);
 
-	/**
-	 * 自定义分页
-	 */
-	List<ContractLogVO> selectContractLogPage(IPage page, ContractLogVO contractLog);
-
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ContractLogMapper.xml

@@ -84,8 +84,4 @@
         </if>
     </select>
 
-    <select id="selectContractLogPage" resultMap="contractLogResultMap">
-        select * from u_contract_log where is_deleted = 0
-    </select>
-
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/IContractLogService.java

@@ -41,9 +41,4 @@ public interface IContractLogService extends BaseService<ContractLog> {
 	 */
 	IPage<ContractLogVO> constructionLogPage(ContractLogVO logVO);
 
-	/**
-	 * 自定义分页
-	 */
-	IPage<ContractLogVO> selectContractLogPage(IPage<ContractLogVO> page, ContractLogVO contractLog);
-
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ContractLogServiceImpl.java

@@ -76,9 +76,4 @@ public class ContractLogServiceImpl extends BaseServiceImpl<ContractLogMapper, C
 		return iPage.setRecords(voResult);
 	}
 
-	@Override
-	public IPage<ContractLogVO> selectContractLogPage(IPage<ContractLogVO> page, ContractLogVO contractLog) {
-		return page.setRecords(this.baseMapper.selectContractLogPage(page, contractLog));
-	}
-
 }