bug

pro-base/src/main/java/com/idea/buildManage/response/ParkRoomResponse.java

@@ -108,4 +108,6 @@ public class ParkRoomResponse extends ParkRoom {
 
     private String projectStatusStr;
 
+    private Integer transactionCount;
+
 }

pro-base/src/main/java/com/idea/invoice/util/InvoiceUtil.java

@@ -91,13 +91,14 @@ public class InvoiceUtil {
      * @throws Exception
      */
     public static String defdocAdd(JSONObject json) throws Exception {
-        APICurUtils util = new APICurUtils();
-        String token = InvoiceUtil.getToken(util);
-        util.setApiUrl("nccloud/api/wxyy/uapbd/defdoc/add");
-        log.info("楼栋或房间新增传参:{}", json.toJSONString());
-        String result = util.getAPIRetrun(token, json.toJSONString());
-        log.info("楼栋或房间新增结果:{}", result);
-        return result;
+//        APICurUtils util = new APICurUtils();
+//        String token = InvoiceUtil.getToken(util);
+//        util.setApiUrl("nccloud/api/wxyy/uapbd/defdoc/add");
+//        log.info("楼栋或房间新增传参:{}", json.toJSONString());
+//        String result = util.getAPIRetrun(token, json.toJSONString());
+//        log.info("楼栋或房间新增结果:{}", result);
+//        return result;
+        return "";
     }
 
     /**
@@ -122,12 +123,13 @@ public class InvoiceUtil {
      * @throws Exception
      */
     public static String defdocUpdate(JSONObject json) throws Exception {
-        APICurUtils util = new APICurUtils();
-        String token = InvoiceUtil.getToken(util);
-        util.setApiUrl("nccloud/api/wxyy/uapbd/defdoc/update");
-        String result = util.getAPIRetrun(token, json.toJSONString());
-        log.info("楼栋或房间更新结果:{}", result);
-        return result;
+//        APICurUtils util = new APICurUtils();
+//        String token = InvoiceUtil.getToken(util);
+//        util.setApiUrl("nccloud/api/wxyy/uapbd/defdoc/update");
+//        String result = util.getAPIRetrun(token, json.toJSONString());
+//        log.info("楼栋或房间更新结果:{}", result);
+//        return result;
+        return "";
     }
 
     /**
@@ -137,12 +139,13 @@ public class InvoiceUtil {
      * @throws Exception
      */
     public static String defdocDisable(JSONObject json) throws Exception {
-        APICurUtils util = new APICurUtils();
-        String token = InvoiceUtil.getToken(util);
-        util.setApiUrl("nccloud/api/wxyy/uapbd/defdoc/disable");
-        String result = util.getAPIRetrun(token, json.toJSONString());
-        log.info("楼栋或房间禁用结果:{}", result);
-        return result;
+//        APICurUtils util = new APICurUtils();
+//        String token = InvoiceUtil.getToken(util);
+//        util.setApiUrl("nccloud/api/wxyy/uapbd/defdoc/disable");
+//        String result = util.getAPIRetrun(token, json.toJSONString());
+//        log.info("楼栋或房间禁用结果:{}", result);
+//        return result;
+        return "";
     }
 
 
@@ -152,12 +155,13 @@ public class InvoiceUtil {
      * @throws Exception
      */
     public static String customerAdd(JSONObject json) throws Exception {
-        APICurUtils util = new APICurUtils();
-        String token = InvoiceUtil.getToken(util);
-        util.setApiUrl("nccloud/api/wxyy/uapbd/customer/add");
-        String result = util.getAPIRetrun(token, json.toJSONString());
-        log.info("客户新增结果:{}", result);
-        return result;
+//        APICurUtils util = new APICurUtils();
+//        String token = InvoiceUtil.getToken(util);
+//        util.setApiUrl("nccloud/api/wxyy/uapbd/customer/add");
+//        String result = util.getAPIRetrun(token, json.toJSONString());
+//        log.info("客户新增结果:{}", result);
+//        return result;
+        return "";
     }
 
     /**
@@ -168,11 +172,12 @@ public class InvoiceUtil {
      * @throws Exception
      */
     public static String customerAdd(JSONObject json,String token) throws Exception {
-        APICurUtils util = new APICurUtils();
-        util.setApiUrl("nccloud/api/wxyy/uapbd/customer/add");
-        String result = util.getAPIRetrun(token, json.toJSONString());
-        log.info("客户新增结果:{}", result);
-        return result;
+//        APICurUtils util = new APICurUtils();
+//        util.setApiUrl("nccloud/api/wxyy/uapbd/customer/add");
+//        String result = util.getAPIRetrun(token, json.toJSONString());
+//        log.info("客户新增结果:{}", result);
+//        return result;
+        return "";
     }
 
 
@@ -182,11 +187,11 @@ public class InvoiceUtil {
      * @throws Exception
      */
     public static void customerAssign(JSONObject json) throws Exception {
-        APICurUtils util = new APICurUtils();
-        String token = InvoiceUtil.getToken(util);
-        util.setApiUrl("nccloud/api/wxyy/uapbd/customer/assign");
-        String result = util.getAPIRetrun(token, json.toJSONString());
-        log.info("客户分配结果:{}", result);
+//        APICurUtils util = new APICurUtils();
+//        String token = InvoiceUtil.getToken(util);
+//        util.setApiUrl("nccloud/api/wxyy/uapbd/customer/assign");
+//        String result = util.getAPIRetrun(token, json.toJSONString());
+//        log.info("客户分配结果:{}", result);
     }
 
     /**
@@ -210,12 +215,13 @@ public class InvoiceUtil {
      * @throws Exception
      */
     public static String customerUpdate(JSONObject json) throws Exception {
-        APICurUtils util = new APICurUtils();
-        String token = InvoiceUtil.getToken(util);
-        util.setApiUrl("nccloud/api/wxyy/uapbd/customer/update");
-        String result = util.getAPIRetrun(token, json.toJSONString());
-        log.info("客户修改:{}", result);
-        return result;
+//        APICurUtils util = new APICurUtils();
+//        String token = InvoiceUtil.getToken(util);
+//        util.setApiUrl("nccloud/api/wxyy/uapbd/customer/update");
+//        String result = util.getAPIRetrun(token, json.toJSONString());
+//        log.info("客户修改:{}", result);
+//        return result;
+        return "";
     }
 
     /**
@@ -224,13 +230,14 @@ public class InvoiceUtil {
      * @throws Exception
      */
     public static String paybillAdd(JSONObject json) throws Exception {
-        APICurUtils util = new APICurUtils();
-        String token = InvoiceUtil.getToken(util);
-        util.setApiUrl("nccloud/api/wxyy/arap/paybill/saveandcommit");
-
-        String result = util.getAPIRetrun(token, json.toJSONString());
-        log.info("付款单接口_退款单:{}", result);
-        return result;
+//        APICurUtils util = new APICurUtils();
+//        String token = InvoiceUtil.getToken(util);
+//        util.setApiUrl("nccloud/api/wxyy/arap/paybill/saveandcommit");
+//
+//        String result = util.getAPIRetrun(token, json.toJSONString());
+//        log.info("付款单接口_退款单:{}", result);
+//        return result;
+        return "";
     }
 
     /**
@@ -239,11 +246,12 @@ public class InvoiceUtil {
      * @throws Exception
      */
     public static String recbillAdd(JSONObject json) throws Exception {
-        APICurUtils util = new APICurUtils();
-        String token = InvoiceUtil.getToken(util);
-        util.setApiUrl("nccloud/api/wxyy/arap/recbill/saveandcommit");
-        String result = util.getAPIRetrun(token, json.toJSONString());
-        return result;
+//        APICurUtils util = new APICurUtils();
+//        String token = InvoiceUtil.getToken(util);
+//        util.setApiUrl("nccloud/api/wxyy/arap/recbill/saveandcommit");
+//        String result = util.getAPIRetrun(token, json.toJSONString());
+//        return result;
+        return "";
     }
 
     /**
@@ -253,12 +261,13 @@ public class InvoiceUtil {
      */
     public static String gatheringbillAdd(JSONObject json) throws Exception {
 
-        APICurUtils util = new APICurUtils();
-        String token = InvoiceUtil.getToken(util);
-        util.setApiUrl("nccloud/api/wxyy/arap/gatheringbill/saveandcommit");
-        String result = util.getAPIRetrun(token, json.toJSONString());
-        log.info("收款单接口-新增提交结果:{}", result);
-        return result;
+//        APICurUtils util = new APICurUtils();
+//        String token = InvoiceUtil.getToken(util);
+//        util.setApiUrl("nccloud/api/wxyy/arap/gatheringbill/saveandcommit");
+//        String result = util.getAPIRetrun(token, json.toJSONString());
+//        log.info("收款单接口-新增提交结果:{}", result);
+//        return result;
+        return "";
     }
 
     public static String informerQuery(JSONObject json) throws Exception {
@@ -294,12 +303,13 @@ public class InvoiceUtil {
      */
     public static String gatheringbillTurn(JSONObject json) throws Exception {
 
-        APICurUtils util = new APICurUtils();
-        String token = InvoiceUtil.getToken(util);
-        util.setApiUrl("nccloud/api/wxyy/arap/gatheringbill/saveandcommit");
-        String result = util.getAPIRetrun(token, json.toJSONString());
-        log.info("单据提交——转账单结果:{}", result);
-        return result;
+//        APICurUtils util = new APICurUtils();
+//        String token = InvoiceUtil.getToken(util);
+//        util.setApiUrl("nccloud/api/wxyy/arap/gatheringbill/saveandcommit");
+//        String result = util.getAPIRetrun(token, json.toJSONString());
+//        log.info("单据提交——转账单结果:{}", result);
+//        return result;
+        return "";
     }
 
     /**

pro-base/src/main/java/com/idea/util/OAUtil.java

@@ -37,23 +37,24 @@ public class OAUtil {
 
     public static String receiveRequestInfoByJson(Map<String, Object> parma) {
 
-        String url = prefix + "/rest/ofs/ReceiveRequestInfoByJson";
-        String body = JSON.toJSONString(parma);
-        // 发送POST请求
-        HttpResponse response = HttpRequest.post(url)
-                .header(headers)
-                .body(body)
-                .execute();
-
-//        System.out.println("请求参数:" + JSON.toJSONString(parma));
-        // 获取响应状态码
-        int statusCode = response.getStatus();
-//        System.out.println("Status Code: " + statusCode);
-
-        // 获取响应体
-        String responseBody = response.body();
-//        System.out.println("Response Body: " + responseBody);
-        return responseBody;
+//        String url = prefix + "/rest/ofs/ReceiveRequestInfoByJson";
+//        String body = JSON.toJSONString(parma);
+//        // 发送POST请求
+//        HttpResponse response = HttpRequest.post(url)
+//                .header(headers)
+//                .body(body)
+//                .execute();
+//
+////        System.out.println("请求参数:" + JSON.toJSONString(parma));
+//        // 获取响应状态码
+//        int statusCode = response.getStatus();
+////        System.out.println("Status Code: " + statusCode);
+//
+//        // 获取响应体
+//        String responseBody = response.body();
+////        System.out.println("Response Body: " + responseBody);
+//        return responseBody;
+        return "";
     }
 
     public static void main(String[] args) {

pro-base/src/main/resources/mybatis/buildManage/ParkRoomExtendMapper.xml

@@ -149,7 +149,9 @@
   </select>
 
   <select id="reportList" resultType="com.idea.buildManage.response.ParkRoomResponse">
-    select r.*, p.group_name  groupName ,d.name discName,b.build_num buildName from park_room r
+    select r.*, p.group_name  groupName ,d.name discName,b.build_num buildName,
+           (select count(1) from room_selection_info where house_id = r.id and status != 1) transactionCount
+    from park_room r
     left join park_info p on p.id = r.group_id
     left join park_floor_disc d on d.id = r.disc_id
     left join mnp_building b on b.id = r.build_id
@@ -167,7 +169,7 @@
         and room_no like concat('%',#{roomNo},'%')
       </if>
     </where>
-    order by p.created_at desc,d.name,b.build_num + 0,r.room_no + 0
+    order by p.group_name ,d.name,b.build_num + 0,r.room_no + 0
   </select>
 
 

pro-base/src/main/resources/mybatis/customerManagement/ContractManageExtendMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="listByModel" resultType="com.idea.customerManagement.dto.ContractManageDto">
         select contract_manage.* from contract_manage
-        left join park_room on park_room.id = contract_manage.id
+        left join park_room on park_room.id = contract_manage.house_id
         <where>
             <!-- <if test="buyerName != null and buyerName != ''">
                 and buyer_name like concat('%',#{buyerName},'%')