2022年11月24 12:39

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/SalesDetailsVo.java

@@ -33,8 +33,7 @@ public class SalesDetailsVo implements Serializable {
 	//客户名称
 	private String corpName;
 	//时间
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-	private Date careteTime;
+	private String careteTime;
 	//业务员
 	private String salesName;
 	//产品编码

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/BidingMapper.xml

@@ -60,6 +60,12 @@
             <if test="biding.deadlineBeginTime != null and biding.deadlineBeginTime != ''">
                 and BB.deadline_time >= #{biding.deadlineBeginTime}
             </if>
+            <if test="biding.deadlineBeginTime != null and biding.deadlineBeginTime != ''">
+                and BB.release_time  >= #{biding.releaseBeginTime}
+            </if>
+            <if test="biding.deadlineBeginTime != null and biding.deadlineBeginTime != ''">
+                and BB.release_time  &lt;= #{biding.releaseEndTime}
+            </if>
         </where>
     </select>
 </mapper>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/BidingItemsServiceImpl.java

@@ -125,11 +125,15 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 	 */
 	@Override
 	public List<BidingItems> getBidingItems(Biding biding, Integer distinguish){
+
+		CorpsAttn corpsAttn = corpsAttnClient.getUser(AuthUtil.getUserId());
+
 		List<BidingItems> list = baseMapper.selectList(new LambdaQueryWrapper<BidingItems>()
 			.eq(BidingItems::getPid, biding.getId())
 			.eq(BidingItems::getDistinguish, distinguish)
 			.eq(BidingItems::getIsDeleted, 0)
-			.eq(BidingItems::getTenantId, AuthUtil.getTenantId()));
+			.eq(BidingItems::getTenantId, AuthUtil.getTenantId())
+			.eq(BidingItems::getCorpsAttnId, corpsAttn.getPid()));
 
 		if (distinguish.equals(1)){
 			if (ObjectUtil.isNotEmpty(list)){
@@ -251,7 +255,7 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 			bidingAgentMapper.updateById(bidingAgent);
 		}
 
-		//items.setStatus(6);
+		items.setStatus(6);
 		baseMapper.updateById(items);
 	}
 }