主营项目修改bug

blade-service/blade-client/src/main/java/org/springblade/client/affairs/controller/AffairsController.java

@@ -2,6 +2,7 @@ package org.springblade.client.affairs.controller;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -56,11 +57,14 @@ public class AffairsController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入goodsDesc")
-	public R<IPage<GoodsDescVO>> list(GoodsDescVO goodsDesc, Query query) {
-		goodsDesc.setTenantId(AuthUtil.getTenantId());
-		goodsDesc.setIsDeleted(0);
-		goodsDesc.setType(GoodsTypeEnum.AFFAIRS.getType());
-		IPage<GoodsDescVO> pages = goodsDescService.selectGoodsDescPage(Condition.getPage(query), goodsDesc);
+	public R<IPage<GoodsDesc>> list(GoodsDescVO goodsDesc, Query query) {
+		LambdaQueryWrapper<GoodsDesc> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.like(StringUtils.isNotBlank(goodsDesc.getCname()),GoodsDesc::getCname,goodsDesc.getCname());
+		queryWrapper.like(StringUtils.isNotBlank(goodsDesc.getCode()),GoodsDesc::getCode,goodsDesc.getCode());
+		queryWrapper.eq(GoodsDesc::getTenantId,AuthUtil.getTenantId());
+		queryWrapper.eq(GoodsDesc::getIsDeleted,0);
+		queryWrapper.eq(GoodsDesc::getType,GoodsTypeEnum.AFFAIRS.getType());
+		IPage<GoodsDesc> pages = goodsDescService.page(Condition.getPage(query), queryWrapper);
 		return R.data(pages);
 	}
 

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -63,17 +63,20 @@ public class ProjectController {
 							@RequestParam(name = "corpAttn", required = false) String corpAttn,
 							@RequestParam(name = "dutyName", required = false) String dutyName,
 							@RequestParam(name = "remark", required = false) String remark,
+							@RequestParam(name = "createStartDate", required = false) String createStartDate,
+							@RequestParam(name = "createEndDate", required = false) String createEndDate,
 							@RequestParam(name = "flag", required = true) int flag
 	)
 	{
 		LambdaQueryWrapper<ServiceProject> serviceProjectLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		serviceProjectLambdaQueryWrapper
+			.between(StringUtils.isNotBlank(createStartDate)&&StringUtils.isNotBlank(createEndDate),ServiceProject::getCreateTime,createStartDate,createEndDate)
 			.eq(ServiceProject::getTenantId, AuthUtil.getTenantId())
 			.like(StringUtils.isNotBlank(dutyName), ServiceProject::getDutyName, dutyName)
 			.like(StringUtils.isNotBlank(remark), ServiceProject::getRemark, remark)
 			.like(StringUtils.isNotBlank(corpAttn), ServiceProject::getCorpAttn, corpAttn)
 			.like(StringUtils.isNotBlank(cName), ServiceProject::getCName, cName)
-			.eq(StringUtils.isNotBlank(code), ServiceProject::getCode, code)
+			.like(StringUtils.isNotBlank(code), ServiceProject::getCode, code)
 			.eq(StringUtils.isNotBlank(corpId), ServiceProject::getCorpId, corpId)
 			.eq(ServiceProject::getIsDeleted, 0)
 			.orderByDesc(ServiceProject::getCreateTime);
@@ -217,7 +220,9 @@ public class ProjectController {
 						  @RequestParam(name = "payStartTime",  required = false) String payStartTime,
 						  @RequestParam(name = "payEndTime",  required = false) String payEndTime,
 						  @RequestParam(name = "createStartTime",  required = false) String createStartTime,
-						  @RequestParam(name = "createEndTime",  required = false) String createEndTime
+						  @RequestParam(name = "createEndTime",  required = false) String createEndTime,
+						  @RequestParam(name = "beginStartTime",  required = false) String beginStartTime,
+						  @RequestParam(name = "beginEndTime",  required = false) String beginEndTime
 						 )
 	{
 		List<String> listStatus=Arrays.asList(status.split(","));
@@ -226,6 +231,7 @@ public class ProjectController {
 		  itemLambdaQueryWrapper
 			  .like(StringUtils.isNotBlank(userName),ServiceProjectItem::getUserName,userName)
 			  .eq(ServiceProjectItem::getTenantId,AuthUtil.getTenantId())
+			  .between(StringUtils.isNotBlank(beginStartTime)&&StringUtils.isNotBlank(beginEndTime),ServiceProjectItem::getBeginTime,beginStartTime,beginEndTime)
 			  .between(StringUtils.isNotBlank(createStartTime)&&StringUtils.isNotBlank(createEndTime),ServiceProjectItem::getCreateTime,createStartTime,createEndTime)
 			  .between(StringUtils.isNotBlank(payStartTime)&&StringUtils.isNotBlank(payEndTime),ServiceProjectItem::getPayTime,payStartTime,payEndTime)
 			  .like(StringUtils.isNotBlank(pName),ServiceProjectItem::getPName,pName)

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/ServiceProjectServiceImpl.java

@@ -61,8 +61,11 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
           {
              throw new RuntimeException("已收金额+未收金额≠合同总金额,请确认后提交");
 		  }
-		  R billNo = serialClient.getBillNo("ZY", null);
-		  serviceProject.setSysNo(billNo.getData().toString());
+		  R billNo = serialClient.getBillNo("ZY", "ZY");
+          if(billNo.isSuccess())
+          {
+			  serviceProject.setSysNo(billNo.getData().toString());
+		  }
 		  serviceProject.setTenantId(AuthUtil.getTenantId());
 		  serviceProject.setCreateTime(new Date());
 		  serviceProject.setCreateUser(SecureUtil.getUserId());