优化

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/BrandRecycleController.java

@@ -76,7 +76,7 @@ public class BrandRecycleController {
      * @return
      */
     @GetMapping("/selectBrand")
-    public R selectBrand(String brandName,int size){
+    public R selectBrand(String brandName,Integer size){
         Page<Brand> brandPage = brandService.selectBrand(brandName, size);
         return R.ok(brandPage);
     }
@@ -88,7 +88,7 @@ public class BrandRecycleController {
      * @return
      */
     @GetMapping("/selectEnterprise")
-    public R selectEnterprise(String enterpriseName,int size){
+    public R selectEnterprise(String enterpriseName,Integer size){
         Page<Enterprise> enterprisePage = brandService.selectEnterprise(enterpriseName, size);
         return R.ok(enterprisePage);
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/BrandService.java

@@ -52,7 +52,7 @@ public interface BrandService {
 
     void updateBrand(BrandVo brandVo);
 
-    Page<Brand> selectBrand(String brandName, int size);
+    Page<Brand> selectBrand(String brandName, Integer size);
 
-    Page<Enterprise> selectEnterprise(String enterpriseName, int size);
+    Page<Enterprise> selectEnterprise(String enterpriseName, Integer size);
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/BrandServiceImpl.java

@@ -601,25 +601,25 @@ public class BrandServiceImpl implements BrandService {
     }
 
     @Override
-    public Page<Brand> selectBrand(String brandName, int size) {
+    public Page<Brand> selectBrand(String brandName, Integer size) {
         QueryWrapper<Brand> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("brand_id","brand_name");
         if (brandName != null && !brandName.equals("")){
             queryWrapper.likeRight("brand_name",brandName);
         }
-        Page<Brand> page = new Page<>(1,size == 0 ? 10:size);
+        Page<Brand> page = new Page<>(1,size == null ? 10:size);
         Page<Brand> brandPage = brandMapper.selectPage(page, queryWrapper);
         return brandPage;
     }
 
     @Override
-    public Page<Enterprise> selectEnterprise(String enterpriseName, int size) {
+    public Page<Enterprise> selectEnterprise(String enterpriseName, Integer size) {
         QueryWrapper<Enterprise> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("enterprise_name","enterprise_usci");
         if (enterpriseName != null && !enterpriseName.equals("")){
             queryWrapper.likeRight("enterprise_name",enterpriseName);
         }
-        Page<Enterprise> page = new Page<>(1,size == 0 ? 10:size);
+        Page<Enterprise> page = new Page<>(1,size == null ? 10:size);
         Page<Enterprise> enterprisePage = enterpriseMapper.selectPage(page, queryWrapper);
         return enterprisePage;
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/BuildWdServiceeImpl.java

@@ -34,13 +34,13 @@ public class BuildWdServiceeImpl implements BuildWdService {
         updateWrapper.eq("wd_id",buildwdVo.getWdId())
             .set("wd_name",buildwdVo.getWdName())
             .set("wd_img",buildwdVo.getWdImg())
-            .set("addrInfo",buildwdVo.getAddrInfo())
-            .set("addrCode",buildwdVo.getAddrCode())
+            .set("addr_info",buildwdVo.getAddrInfo())
+            .set("addr_code",buildwdVo.getAddrCode())
             .set("lat",buildwdVo.getLat())
             .set("lng",buildwdVo.getLng())
-            .set("typeCodeBy",buildwdVo.getTypeCodeBy())
-            .set("typeNameBy",buildwdVo.getTypeNameBy())
-            .set("updateTime", DateUtils.getTime());
+            .set("type_code_by",buildwdVo.getTypeCodeBy())
+            .set("type_name_by",buildwdVo.getTypeNameBy())
+            .set("update_time", DateUtils.getTime());
         wdInfoDao.update(null,updateWrapper);
 
         //2.修改楼宇信息
@@ -50,5 +50,6 @@ public class BuildWdServiceeImpl implements BuildWdService {
             .set("build_type",buildwdVo.getBuildWd().getBuildType())
             .set("households",buildwdVo.getBuildWd().getHouseholds())
             .set("people_count",buildwdVo.getBuildWd().getPeopleCount());
+        buildWdDao.update(null,updateWrapper1);
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/EnterpriseWdServiceImpl.java

@@ -48,5 +48,6 @@ public class EnterpriseWdServiceImpl implements EnterpriseWdService {
         UpdateWrapper<EnterpriseWd> updateWrapper1 = new UpdateWrapper<>();
         updateWrapper1.eq("wd_id",enterpriseWdVo.getWdId())
             .set("enterprise_usci",enterpriseWdVo.getEnterpriseWd().getEnterpriseUsci());
+        enterpriseWdDao.update(null,updateWrapper1);
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/HouseWdServiceImpl.java

@@ -50,6 +50,6 @@ public class HouseWdServiceImpl implements HouseWdService {
             .set("property_type",houseWdVo.getHouseWd().getPropertyType())
             .set("households",houseWdVo.getHouseWd().getHouseholds())
             .set("people_count",houseWdVo.getHouseWd().getPeopleCount());
-
+        houseWdDao.update(null,updateWrapper1);
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TrafficWdServiceImpl.java

@@ -48,5 +48,6 @@ public class TrafficWdServiceImpl implements TrafficWdService {
         UpdateWrapper<TrafficWd> updateWrapper1 = new UpdateWrapper<>();
         updateWrapper1.eq("wd_id",trafficWd.getWdId())
             .set("cars",trafficWd.getTrafficWd().getCars());
+        trafficWdDao.update(null,updateWrapper1);
     }
 }

ruoyi-demo/src/main/resources/mapper/demo/BrandMapper.xml

@@ -82,10 +82,10 @@
         select * from ddt_brand
         <where>
             <if test="brand.brandName != null and brand.brandName != ''">
-                and brand_name like concat('%',#{brandName},'%')
+                and brand_name like concat('%',#{brand.brandName},'%')
             </if>
             <if test="brand.showDelete != -1">
-                and show_delete = #{showDelete}
+                and show_delete = #{brand.showDelete}
             </if>
             <if test="brand.industryCode != null and brand.industryCode != ''">
                 and industry_code = #{brand.industryCode}