供应商维多利亚扩展

hx-supply/src/main/java/com/fjhx/supply/controller/supplier/SupplierInfoController.java

@@ -40,6 +40,14 @@ public class SupplierInfoController {
     }
 
     /**
+     * 供应商分页 维多利亚
+     */
+    @PostMapping("/pageByWdly")
+    public Page<SupplierInfoVo> pageByWdly(@RequestBody SupplierInfoSelectDto dto) {
+        return supplierInfoService.getPageByWdly(dto);
+    }
+
+    /**
      * 供应商明细
      */
     @PostMapping("/detail")

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/dto/SupplierInfoSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 供应商列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-03-17
  */
 @Getter
@@ -19,4 +19,9 @@ public class SupplierInfoSelectDto extends BaseSelectDto {
      */
     private Integer type;
 
+    /**
+     * 维多利亚有无账期过滤
+     */
+    private Integer accountPeriodType;
+
 }

hx-supply/src/main/java/com/fjhx/supply/entity/supplier/po/SupplierInfo.java

@@ -68,4 +68,9 @@ public class SupplierInfo extends BasePo {
      */
     private String remark;
 
+    /**
+     * 维多利亚扩展json
+     */
+    private String victoriatouristJson;
+
 }

hx-supply/src/main/java/com/fjhx/supply/service/supplier/SupplierInfoService.java

@@ -22,6 +22,10 @@ public interface SupplierInfoService extends BaseService<SupplierInfo> {
      * 供应商分页
      */
     Page<SupplierInfoVo> getPage(SupplierInfoSelectDto dto);
+    /**
+     * 供应商分页维多利亚
+     */
+    Page<SupplierInfoVo> getPageByWdly(SupplierInfoSelectDto dto);
 
     /**
      * 供应商明细

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -52,6 +52,28 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
         return page;
     }
 
+    /**供应商分页维多利亚用*/
+    @Override
+    public Page<SupplierInfoVo> getPageByWdly(SupplierInfoSelectDto dto) {
+        IWrapper<SupplierInfo> wrapper = getWrapper();
+        wrapper.orderByDesc("si", SupplierInfo::getId);
+        wrapper.eq("si", SupplierInfo::getType, dto.getType());
+        wrapper.keyword(dto,
+                new SqlField("si", SupplierInfo::getName),
+                new SqlField("si", SupplierInfo::getCode)
+        );
+        //根据账期过滤
+        wrapper.eq("json_unquote( si.victoriatourist_json -> '$.accountPeriod' )",dto.getAccountPeriodType());
+        Page<SupplierInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+
+        List<SupplierInfoVo> records = page.getRecords();
+        if (records.size() == 0) {
+            return page;
+        }
+        AreaUtil.setAreaName(records);
+        return page;
+    }
+
     @Override
     public SupplierInfoVo detail(Long id) {
         SupplierInfo SupplierInfo = this.getById(id);

hx-supply/src/main/resources/mapper/supplier/SupplierInfoMapper.xml

@@ -17,7 +17,8 @@
             si.create_user,
             si.create_time,
             si.update_user,
-            si.update_time
+            si.update_time,
+            si.victoriatourist_json
         from supplier_info si
             ${ew.customSqlSegment}
     </select>