Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -132,5 +132,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
      * @return 统计数量数组
      */
     List<Long> countAllInFlowingForDPNoFinishedBizData(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
+
+    List<Map<String, String>> getOrgCodeByCompanyCodes(@Param("regionCodes") List<Integer> regionCodes);
 }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/DPStatisticsMapper.java

@@ -11,32 +11,6 @@ public interface DPStatisticsMapper {
     List<Map<String, Object>> maintenanceCountTopTen(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
     List<Map<String, Object>> maintenanceCount(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
 
-    int installCount(@Param("orgCode") String orgCode);
-
-    int maintenanceNoticeCount(@Param("orgCode") String orgCode);
-
-    int reformCount(@Param("orgCode") String orgCode);
-
-    int transferCount(@Param("orgCode") String orgCode);
-
-    int useCount(@Param("orgCode") String orgCode);
-
-    int vehicleCount(@Param("orgCode") String orgCode);
-
-    int changeNameCount(@Param("orgCode") String orgCode);
-
-    int changeReformCount(@Param("orgCode") String orgCode);
-
-    int changeTransferCount(@Param("orgCode") String orgCode);
-
-    int changeUnitCount(@Param("orgCode") String orgCode);
-
-    int changeVehicleCount(@Param("orgCode") String orgCode);
-
-    int disableCount(@Param("orgCode") String orgCode);
-
-    int cancelCount(@Param("cityCode") String cityCode);
-
     List<Map<String, Object>> installEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
 
     List<Map<String, Object>> maintenanceEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
@@ -67,4 +41,29 @@ public interface DPStatisticsMapper {
 
     String newVehicleCountByYear(@Param("cityCode") String cityCode);
     String newVehicleCountByMonth(@Param("cityCode") String cityCode);
+    List<Map<String, Object>> installCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
+
+    List<Map<String, Object>> maintenanceNoticeCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
+
+    List<Map<String, Object>> reformCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
+
+    List<Map<String, Object>> transferCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
+
+    List<Map<String, Object>> useCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
+
+    List<Map<String, Object>> vehicleCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
+
+    List<Map<String, Object>> changeNameCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
+
+    List<Map<String, Object>> changeReformCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
+
+    List<Map<String, Object>> changeTransferCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
+
+    List<Map<String, Object>> changeUnitCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
+
+    List<Map<String, Object>> changeVehicleCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
+
+    List<Map<String, Object>> disableCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
+
+    List<Map<String, Object>> cancelCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -1036,4 +1036,12 @@
         union all
         select count(1) from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位待提交' and a.audit_status  != '使用单位已撤回' and a.audit_status  != '已作废' and a.audit_status  != '已完成' and date_ge(CAST(a.create_date as date),#{dto.beginDate}) and date_le(CAST(a.create_date as date),#{dto.endDate})
     </select>
+    <select id="getOrgCodeByCompanyCodes" resultType="java.util.Map">
+        select P.org_code AS orgCode,R.region_name AS regionName from privilege_company P
+        INNER JOIN systemctl_region R ON P.company_code = R.region_code
+        where P.company_code in
+        <foreach collection="regionCodes" item="regionCode" separator="," open="(" close=")">
+            #{regionCode} :: VARCHAR
+        </foreach>
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/UseRegisterEquipUsedCheckImpl.java

@@ -21,7 +21,7 @@ public class UseRegisterEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
     private RedissonClient redissonClient;
 
-    private String bizType = "useRegister";
+    private String bizType = "useRegistration";
 
     private JgUseRegistrationMapper useRegistrationMapper;
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPSubServiceImpl.java

@@ -483,6 +483,19 @@ public class DPSubServiceImpl {
         String url = apiObj.getString("apiPath");
         String reqType = !ValidationUtil.isEmpty(apiObj.getString("httpMethod")) ? apiObj.getString("httpMethod") : "GET";
         Object params = apiObj.get("params");
+        if (ValidationUtil.isEmpty(params) && !ValidationUtil.isEmpty(apiObj.get("queryParams"))){
+            JSONObject queryParam = new JSONObject();
+            JSONArray queryParams = apiObj.getJSONArray("queryParams");
+            queryParams.stream().forEach(x -> {
+                JSONObject xObj = (JSONObject) x;
+                if ("staticValue".equals(JsonValueUtils.getValueByKey(x, "value", "value.source"))){
+                    queryParam.put(xObj.getString("name"), xObj.getJSONObject("value").getString("value"));
+                }
+            });
+            if (!ValidationUtil.isEmpty(queryParam)){
+                params = queryParam;
+            }
+        }
         Object body = apiObj.get("body");
         ResponseEntity<String> responseEntity = null;
         //如果url以/开头，则调用本服务内接口
@@ -528,7 +541,6 @@ public class DPSubServiceImpl {
 
         if (200 != responseModel.getStatus()){
             log.info("调用第三方接口失败, 请求地址：{}", apiObj);
-            throw new RuntimeException(String.format("调用第三方接口失败！"));
         }
 
         JSONObject ruleData = apiObj.getJSONObject("ruleData");