Merge remote-tracking branch 'origin/dev' into dev

renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java

@@ -99,7 +99,8 @@ public class HistoryController {
             @ApiImplicitParam(name = "processDefinitionId", value = "流程定义ID", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType = "Date"),
             @ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType = "Date"),
-            @ApiImplicitParam(name = "ended", value = "是否结束（true:是，false:否）", paramType = "query", dataType = "String")
+            @ApiImplicitParam(name = "ended", value = "是否结束（true:是，false:否）", paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "processDefinitionKey", value = "流程定义KEY", paramType = "query", dataType = "String")
     })
 //    @RequiresPermissions("sys:his:all")
     public Result<ProcessInstanceDTO> getMyProcessInstancePage(@ApiIgnore @RequestParam Map<String, Object> params) {

renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java

@@ -185,6 +185,10 @@ public class ActHistoryService {
             query.processInstanceBusinessKey((String) params.get("businessKey"));
         }
 
+        if (StringUtils.isNotEmpty((String) params.get("processDefinitionKey"))) { // 流程定义key
+            query.processDefinitionKey((String) params.get("processDefinitionKey"));
+        }
+
         if (StringUtils.isNotEmpty((String) params.get("processDefinitionId"))) {
             query.processDefinitionId((String) params.get("processDefinitionId"));
         }

renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -904,7 +904,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                 .eq("approve_status", "通过");
         List<TAbilityApplicationEntity> applicationEntities = tAbilityApplicationDao.selectList(queryWrapper);
         ArrayList cameraList = new ArrayList();
-        applicationEntities.forEach(index -> cameraList.add(resourceDao.selectCameraDTOById(Long.parseLong(index.getResourceId()))));
+        applicationEntities.forEach(index -> cameraList.add(cameraChannelMapper.selectByChannelCode(index.getCameraList())));
         return cameraList;
     }
 

renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml

@@ -49,22 +49,73 @@
 
     <select id="countApplyAll" resultType="java.lang.Long">
         SELECT
-        COUNT(*)
+            SUM( count )
         FROM
-        ( SELECT DISTINCT instance_id FROM t_ability_application WHERE 1 = 1 ) temp
+            (
+                SELECT
+                    COUNT( 1 ) AS count
+                FROM
+                    (
+                        SELECT
+                            COUNT( id )
+                        FROM
+                            t_ability_application
+                        WHERE
+                            resource_id != 8888888880000000001
+                          AND instance_id != ''
+                          AND instance_id IS NOT NULL
+                          AND camera_list != ''
+                          AND camera_list IS NOT NULL
+                        GROUP BY
+                            instance_id
+                    ) temp UNION
+                SELECT
+                    COUNT( taa.id )
+                FROM
+                    t_ability_application taa,
+                    tb_data_resource tdr
+                WHERE
+                    1 = 1
+                  AND taa.resource_id = tdr.id
+                  AND tdr.type != '赋能案例'
+                  AND tdr.del_flag = 0
+                GROUP BY
+                    tdr.type
+            ) temp2
     </select>
 
     <select id="getAmountGroupByType" resultType="java.util.Map">
         SELECT
-        tbr.type AS type,
-        COUNT( taa.id ) AS amount
+            '基础设施' AS 'type',
+            COUNT( 1 ) AS 'amount'
         FROM
-        t_ability_application AS taa
-        INNER JOIN tb_data_resource AS tbr ON taa.resource_id = tbr.id
+            (
+                SELECT
+                    COUNT( id )
+                FROM
+                    t_ability_application
+                WHERE
+                    resource_id != 8888888880000000001
+                  AND instance_id != ''
+                  AND instance_id IS NOT NULL
+                  AND camera_list != ''
+                  AND camera_list IS NOT NULL
+                GROUP BY
+                    instance_id
+            ) temp UNION
+        SELECT
+            tdr.type,
+            COUNT( taa.id )
+        FROM
+            t_ability_application taa,
+            tb_data_resource tdr
         WHERE
-        taa.approve_status = '通过'
+            1 = 1
+          AND taa.resource_id = tdr.id
+          AND tdr.type != '赋能案例'
+          AND tdr.del_flag = 0
         GROUP BY
-        tbr.type
+            tdr.type
     </select>
 
     <select id="selectDeptApplyCount" resultType="java.util.Map">

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -108,6 +108,8 @@
     <select id="selectWithAttrs" resultMap="resourceDTO">
         SELECT
         DISTINCT tdr.id,
+        tdr.create_date,
+        tdr.visits,
         IFNULL(taa2.approve_status, '未申请') AS "applyState",
         IFNULL(trs.score, 0 ) AS "score",
         IFNULL(taa.applyCount, 0 ) AS "applyCount",