供应商相关

ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/dto/AddressAreaDTO.java

@@ -20,7 +20,7 @@ public class AddressAreaDTO implements Serializable {
     /**
      * 地区编码
      */
-    private String areaCode;
+    private String areaId;
 
     /**
      * 地区名称

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/ContractSupplyController.java

@@ -44,7 +44,6 @@ public class ContractSupplyController extends BaseController {
     @SaCheckPermission("supplier:contractsupply:list")
     @GetMapping("/list")
     public TableDataInfo<ContractSupplyVo> list(ContractSupplyBo bo, PageQuery pageQuery) {
-
         return contractSupplyService.queryPageList(bo, pageQuery);
     }
 

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/ContractSupply.java

@@ -89,6 +89,8 @@ public class ContractSupply extends TenantEntity {
      */
     private String proFile;
 
+    private Long companyId;
+
     /**
      * 附件文件名
      */

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/SupplyArea.java

@@ -42,6 +42,8 @@ public class SupplyArea extends TenantEntity {
      */
     private String areaCode;
 
+    private Long areaId;
+
     /**
      * 区域名称（如北京市/江苏省南京市/天河区）
      */

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/bo/ContractSupplyBo.java

@@ -107,6 +107,7 @@ public class ContractSupplyBo extends BaseEntity {
      */
     private String status;
 
+    private Long companyId;
 
     /**
      * 备注信息

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/bo/SupplyAreaBo.java

@@ -40,6 +40,8 @@ public class SupplyAreaBo extends BaseEntity {
      */
     private String areaCode;
 
+    private Long areaId;
+
     /**
      * 区域名称（如北京市/江苏省南京市/天河区）
      */

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/vo/ContractSupplyVo.java

@@ -88,6 +88,11 @@ public class ContractSupplyVo implements Serializable {
      */
     private String timeRemaining;
 
+    /**
+     * 公司ID
+     */
+    private Long companyId;
+
     private List<ContractSupplyProductVo> contractProduct;
 
 

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/vo/SupplyAreaVo.java

@@ -51,6 +51,8 @@ public class SupplyAreaVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "如=国标行政区域编码/自定义区域编码")
     private String areaCode;
 
+    private Long areaId;
+
     /**
      * 区域名称（如北京市/江苏省南京市/天河区）
      */

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/ContractSupplyServiceImpl.java

@@ -109,7 +109,9 @@ public class ContractSupplyServiceImpl  extends ServiceImpl<ContractSupplyMapper
             SupplierInfo one = supplierInfoService.getOne(lqw);
             bo.setSupplierId(one.getId());
         }
+
         LambdaQueryWrapper<ContractSupply> lqw = buildQueryWrapper(bo);
+        lqw.orderByDesc(ContractSupply::getCreateTime);
         Page<ContractSupplyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         setSupplierNames(result.getRecords());
         // 2处理状态和剩余时限
@@ -210,7 +212,7 @@ public class ContractSupplyServiceImpl  extends ServiceImpl<ContractSupplyMapper
     private LambdaQueryWrapper<ContractSupply> buildQueryWrapper(ContractSupplyBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ContractSupply> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(ContractSupply::getId);
+        //lqw.orderByAsc(ContractSupply::getId);
         lqw.eq(bo.getSupplierId() != null, ContractSupply::getSupplierId, bo.getSupplierId());
         lqw.eq(bo.getContractSupplyNo() != null, ContractSupply::getContractSupplyNo, bo.getContractSupplyNo());
         lqw.eq(bo.getStartTime() != null, ContractSupply::getStartTime, bo.getStartTime());
@@ -242,8 +244,13 @@ public class ContractSupplyServiceImpl  extends ServiceImpl<ContractSupplyMapper
             product.setContractSupplyNo(contractSupplyNo);
             product.setContractSupplyId(id);
         } );
-        boolean flag1 = remoteContractProdcutService.add(contractProduct);
-        //boolean flag2 = baseMapper.insert(add) > 0;
+
+        boolean flag1 =false;
+        if (contractProduct !=null){
+            flag1 = remoteContractProdcutService.add(contractProduct);
+        }else {
+            flag1 = true;
+        }
         return flag1&&flag2;
     }
 

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/SupplierBankServiceImpl.java

@@ -16,6 +16,7 @@ import org.dromara.customer.domain.vo.SupplierBankVo;
 import org.dromara.customer.domain.SupplierBank;
 import org.dromara.customer.mapper.SupplierBankMapper;
 import org.dromara.customer.service.ISupplierBankService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -92,9 +93,19 @@ public class SupplierBankServiceImpl  extends ServiceImpl<SupplierBankMapper, Su
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(SupplierBankBo bo) {
         SupplierBank add = MapstructUtils.convert(bo, SupplierBank.class);
-        validEntityBeforeSave(add);
+        // 如果设置为主账号
+        if ("1".equals(add.getIsture())) {
+            // 把当前供应商下的其他账号全部改成非主账号
+            baseMapper.update(
+                null,
+                Wrappers.lambdaUpdate(SupplierBank.class)
+                    .set(SupplierBank::getIsture, "0")
+                    .eq(SupplierBank::getSupplierId, add.getSupplierId())
+            );
+        }
         boolean flag = baseMapper.insert(add) > 0;
         return flag;
     }
@@ -106,8 +117,21 @@ public class SupplierBankServiceImpl  extends ServiceImpl<SupplierBankMapper, Su
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(SupplierBankBo bo) {
         SupplierBank update = MapstructUtils.convert(bo, SupplierBank.class);
+        // 如果设置为主账号
+        if ("1".equals(update.getIsture())) {
+
+            // 把当前供应商下的其他账号全部改成非主账号
+            baseMapper.update(
+                null,
+                Wrappers.lambdaUpdate(SupplierBank.class)
+                    .set(SupplierBank::getIsture, "0")
+                    .eq(SupplierBank::getSupplierId, update.getSupplierId())
+                    .ne(update.getId() != null, SupplierBank::getId, update.getId())
+            );
+        }
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/SupplierInfoServiceImpl.java

@@ -536,7 +536,7 @@ public class SupplierInfoServiceImpl  extends ServiceImpl<SupplierInfoMapper, Su
                 lqw.in(SupplierInfo::getId, -1L);
             }
         }
-
+        lqw.orderByDesc(SupplierInfo::getSupplierNo);
         Page<SupplierInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         List<SupplierInfoVo> supplierVos = result.getRecords();
 
@@ -549,8 +549,7 @@ public class SupplierInfoServiceImpl  extends ServiceImpl<SupplierInfoMapper, Su
         }
 
         // 3. 封装分页结果
-        Page<SupplierInfoVo> newPage = copyPageResult(result, supplierVos);
-        return TableDataInfo.build(newPage);
+        return TableDataInfo.build(result);
 
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/AddressArea.java

@@ -40,7 +40,7 @@ public class AddressArea extends TenantEntity {
     /**
      * 父类ID
      */
-    private Long parentCode;
+    private Long parentId;
 
     /**
      * 地区简称

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/AddressAreaBo.java

@@ -38,7 +38,7 @@ public class AddressAreaBo extends BaseEntity {
     /**
      * 父类ID
      */
-    private Long parentCode;
+    private Long parentId;
 
     /**
      * 地区简称

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AddressAreaVo.java

@@ -50,7 +50,7 @@ public class AddressAreaVo implements Serializable {
      * 父类ID
      */
     @ExcelProperty(value = "父类ID")
-    private Long parentCode;
+    private Long parentId;
 
     /**
      * 地区简称

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteAddressAreaServiceImpl.java

@@ -28,7 +28,7 @@ public class RemoteAddressAreaServiceImpl implements RemoteAddressAreaService {
             addressAreaDTO.setId(item.getId());
             addressAreaDTO.setAreaName(item.getAreaName());
             addressAreaDTO.setLevel(item.getLevel());
-            addressAreaDTO.setParentCode(item.getParentCode());
+            addressAreaDTO.setParentCode(item.getParentId());
             return addressAreaDTO;
         }).toList();
     }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/AddressAreaServiceImpl.java

@@ -145,7 +145,7 @@ public class AddressAreaServiceImpl  extends ServiceImpl<AddressAreaMapper, Addr
         }
         // 2. 第二步：查询中国下的所有省（level=1，parentCode=中国编码）
         LambdaQueryWrapper<AddressArea> provinceWrapper = new LambdaQueryWrapper<AddressArea>()
-            .eq(AddressArea::getParentCode, chinaArea.getId())  // 父编码=中国编码
+            .eq(AddressArea::getParentId, chinaArea.getId())  // 父编码=中国编码
             .eq(AddressArea::getLevel, 1)  // 只查省（level=1）
             .orderByAsc(AddressArea::getAreaCode); // 按编码排序
         List<AddressAreaVo> provinceList = baseMapper.selectVoList(provinceWrapper);
@@ -158,7 +158,7 @@ public class AddressAreaServiceImpl  extends ServiceImpl<AddressAreaMapper, Addr
 
         // 4. 第四步：查询所有市（level=2，parentCode属于省的areaCode列表）
         LambdaQueryWrapper<AddressArea> cityWrapper = new LambdaQueryWrapper<AddressArea>()
-            .in(AddressArea::getParentCode, provinceCodeList)  // 父编码=任意省的编码
+            .in(AddressArea::getParentId, provinceCodeList)  // 父编码=任意省的编码
             .eq(AddressArea::getLevel, 2)  // 只查市（level=2）
             .orderByAsc(AddressArea::getAreaCode);
         List<AddressAreaVo> cityList = baseMapper.selectVoList(cityWrapper);
@@ -166,7 +166,7 @@ public class AddressAreaServiceImpl  extends ServiceImpl<AddressAreaMapper, Addr
         // 5. 第五步：将省和市转换为Vo，并构建树形结构
         // 5.2 市Entity转Vo，并按父编码（省编码）分组
         Map<Long, List<AddressAreaVo>> cityVoMap = cityList.stream()
-            .collect(Collectors.groupingBy(AddressAreaVo::getParentCode));
+            .collect(Collectors.groupingBy(AddressAreaVo::getParentId));
 
         // 5.3 为每个省挂载对应的市
         provinceList.forEach(provinceVo -> {
@@ -214,13 +214,13 @@ public class AddressAreaServiceImpl  extends ServiceImpl<AddressAreaMapper, Addr
         for (AddressAreaVo vo : voList) {
 
             // 省级：parentCode = 中国id
-            if (vo.getParentCode().equals(china.getId())) {
+            if (vo.getParentId().equals(china.getId())) {
                 provinceList.add(vo);
                 continue;
             }
 
             // 找父节点
-            AddressAreaVo parent = map.get(vo.getParentCode());
+            AddressAreaVo parent = map.get(vo.getParentId());
             if (parent != null) {
                 if (parent.getChildren() == null) {
                     parent.setChildren(new ArrayList<>());
@@ -257,7 +257,7 @@ public class AddressAreaServiceImpl  extends ServiceImpl<AddressAreaMapper, Addr
 
         // 2. 按市的父编码（省编码）分组
         Map<String, List<AddressAreaVo>> cityGroupByProvinceCode = cityList.stream()
-            .collect(Collectors.groupingBy(vo -> vo.getParentCode().toString())); // 注意类型转换
+            .collect(Collectors.groupingBy(vo -> vo.getParentId().toString())); // 注意类型转换
 
         // 3. 为每个省挂载对应的市
         provinceList.forEach(province -> {