Merge remote-tracking branch 'origin/master'

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/api/controller/HlwOrderApiController.java

@@ -188,25 +188,14 @@ public class HlwOrderApiController extends JeecgController<HlwOrder, IHlwOrderSe
         hlwOrder.setCompanyName(companyName);
         hlwOrder.setCreateTime_begin(createTime_begin);
         hlwOrder.setCreateTime_end(createTime_end);
-        if (companyCodeList.size() > 0) {
-            //不分页
-            if (pageSize == -1) {
-                List<HlwOrder> list = hlwOrderService.queryOrderListNoPage(companyCodeList, hlwOrder, applicationId);
-                return Result.ok(list);
-            } else {
-                Page<HlwOrder> page = new Page<HlwOrder>(pageNo, pageSize);
-                Page<HlwOrder> pageList = hlwOrderService.queryOrderList(page, companyCodeList, hlwOrder, applicationId);
-                return Result.ok(pageList);
-            }
+        //不分页
+        if (pageSize == -1) {
+            List<HlwOrder> list = hlwOrderService.queryOrderListNoPage(companyCodeList, hlwOrder, applicationId);
+            return Result.ok(list);
         } else {
-            //不分页
-            if (pageSize == -1) {
-                List<HlwOrder> list = new ArrayList<>();
-                return Result.ok(list);
-            } else {
-                Page<HlwOrder> pageList = new Page<>();
-                return Result.ok(pageList);
-            }
+            Page<HlwOrder> page = new Page<HlwOrder>(pageNo, pageSize);
+            Page<HlwOrder> pageList = hlwOrderService.queryOrderList(page, companyCodeList, hlwOrder, applicationId);
+            return Result.ok(pageList);
         }
     }
 

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/api/controller/HlwPaymentApiController.java

@@ -70,14 +70,12 @@ public class HlwPaymentApiController extends JeecgController<HlwPayment, IHlwPay
             companyCodeList.add(jsonArray.get(i).toString());
         }
         Page<HlwPayment> pageList = new Page<>();
-        if (companyCodeList.size() > 0) {
-            HlwPayment hlwPayment = new HlwPayment();
-            hlwPayment.setPaymentCode(paymentCode);
-            hlwPayment.setCompanyName(companyName);
-            hlwPayment.setStatus(status);
-            Page<HlwPayment> page = new Page<HlwPayment>(pageNo, pageSize);
-            pageList = hlwPaymentService.paymentList(page, companyCodeList, hlwPayment, applicationId);
-        }
+        HlwPayment hlwPayment = new HlwPayment();
+        hlwPayment.setPaymentCode(paymentCode);
+        hlwPayment.setCompanyName(companyName);
+        hlwPayment.setStatus(status);
+        Page<HlwPayment> page = new Page<HlwPayment>(pageNo, pageSize);
+        pageList = hlwPaymentService.paymentList(page, companyCodeList, hlwPayment, applicationId);
         return Result.ok(pageList);
     }
 

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlworder/service/impl/HlwRequirementServiceImpl.java

@@ -67,7 +67,6 @@ public class HlwRequirementServiceImpl extends ServiceImpl<HlwRequirementMapper,
         String requirementName = jsonObject.getString("requirementName");
         String description = jsonObject.getString("description");
         Date requirementTime = jsonObject.getDate("requirementTime");
-        JSONArray jsonArray = jsonObject.getJSONArray("userSubcontract");
         //查询当前需求
         //付款单id
         String id = jsonObject.getString("id");

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/controller/HlwPaymentDetailController.java

@@ -363,7 +363,7 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
         list.add(businessAccountUtils.round(businessAccountUtils.div(weekUser, monthUser), 2) * 100);
         list.add(monthUser);
         //本月新增用户占年新增用户比例
-        list.add(businessAccountUtils.round(businessAccountUtils.div(monthUser, yearUser), 2) * 100 );
+        list.add(businessAccountUtils.round(businessAccountUtils.div(monthUser, yearUser), 2) * 100);
         //用户环增长比
         list.add(rand.nextInt(9) + 8 + "%");
         return Result.ok(list);
@@ -387,7 +387,7 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
             LocalDate lastDate = localDate.minusMonths(i + 1);
             int increasedUser = hlwUserMapper.monthAddUser(DateUtils.asDate(lastDate));
             map.put("value", increasedUser);
-            map.put("x", lastDate.getMonthValue()+"月");
+            map.put("x", lastDate.getMonthValue() + "月");
             list.add(0, map);
         }
 
@@ -424,7 +424,7 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
             LocalDate lastDate = localDate.minusMonths(i + 1);
             int monthOrder1 = hlwOrderMapper.monthAddOrder(DateUtils.asDate(lastDate));
             map.put("value", monthOrder1);
-            map.put("x",  lastDate.getMonthValue()+"月");
+            map.put("x", lastDate.getMonthValue() + "月");
             list1.add(0, map);
         }
         list.add(list1);
@@ -432,19 +432,21 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
         //企业信息列表
         int totalCompany = hlwCompanyMapper.findTotalCompany();
         Random rand = new Random();
-        List<HlwCompany> hlwCompanyList=new ArrayList<>();
-        if(totalCompany>5){
+        List<HlwCompany> hlwCompanyList = new ArrayList<>();
+        if (totalCompany > 5) {
             //企业信息列表查询参数为limit两个参数，总计随机查询5条
-             hlwCompanyList = hlwCompanyMapper.findCompanyList(rand.nextInt(totalCompany - 5), 5);
-        }else{
-             hlwCompanyList = hlwCompanyMapper.findCompanyList(0, totalCompany);
+            hlwCompanyList = hlwCompanyMapper.findCompanyList(rand.nextInt(totalCompany - 5), 5);
+        } else {
+            hlwCompanyList = hlwCompanyMapper.findCompanyList(0, totalCompany);
+        }
+        for (HlwCompany hlwCompany : hlwCompanyList) {
+            String provinceCityCountry = hlwCompany.getProvinceCityCountry();
+            provinceCityCountry = provinceCityCountry.replaceFirst("-", "#");
+            String province = provinceCityCountry.substring(0, provinceCityCountry.lastIndexOf("#"));
+            hlwCompany.setProvinceCityCountry(province);
         }
         list.add(hlwCompanyList);
         return Result.ok(list);
     }
 
-    private static Date localDate2Date(LocalDate localDate) {
-        ZonedDateTime zonedDateTime = localDate.atStartOfDay(ZoneId.systemDefault());
-        return Date.from(zonedDateTime.toInstant());
-    }
 }