Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/vo/TaskStatisticVo.java

@@ -21,15 +21,15 @@ public class TaskStatisticVo {
     /**
      * 任务总数
      */
-    private Float taskTotal;
+    private float taskTotal;
 
     /**
      * 完成数量
      */
-    private Float completedCount;
+    private float completedCount;
 
     /**
      * 完成率
      */
-    private Float completedRate;
+    private float completedRate;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -257,9 +257,9 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
     public int updateCoreEvaluateTask(EvaluateTaskContentDTO evaluateTaskContentDTO) {
         //查询任务
         CoreEvaluateTask coreEvaluateTask = coreEvaluateTaskMapper.selectById(evaluateTaskContentDTO.getId());
- /*       if (!SecurityUtils.getLoginUser().getOrgId().equals(coreEvaluateTask.getOrgId())) {
+        if (!SecurityUtils.getLoginUser().getOrgId().equals(coreEvaluateTask.getOrgId())) {
             throw new RuntimeException("您没有该任务的评价权限");
-        }*/
+        }
         List<Long> roleByEvaluateId = coreEvaluateRoleMapper.getRoleByEvaluateId(coreEvaluateTask.getPlanId());
         List<SysRole> roleByUserId = remoteRoleService.getRoleByUserId(SecurityUtils.getUserId(), SecurityConstants.INNER);
         List<Long> collect = roleByUserId.stream().map(SysRole::getId).collect(Collectors.toList());

soc-modules/soc-modules-core/src/main/resources/mapper/board/CockpitMapper.xml

@@ -4,72 +4,71 @@
     <select id="resumption" resultType="com.xunmei.core.board.vo.TaskStatisticVo">
         SELECT
         org_id,
-        path as org_path,
+         org_path,
         count( 0 ) AS count,
         SUM( CASE `status` WHEN 3 THEN 1 ELSE 0 END ) AS completed
         FROM
         core_resumption r
         <!--                INNER  join ( SELECT id,path FROM sys_org WHERE path LIKE CONCAT(( SELECT path FROM sys_org WHERE id =#{orgId}), '%' ) AND deleted = 0 ) o on r.org_Id=o.id-->
         WHERE
-        ymd_date >= #{startDate} and org_path like concat(#{orgPath},'%')
-        GROUP BY
-        org_id
+        ymd_date >= #{date} and org_path like concat(#{orgPath},'%')
+        GROUP BY org_id,org_path
     </select>
     <select id="safetyCheck" resultType="com.xunmei.core.board.vo.TaskStatisticVo">
         SELECT
         org_id,
-        path as org_path,
+        org_path,
         count( 0 ) AS count,
         SUM( CASE `status` WHEN 3 THEN 1 ELSE 0 END ) AS completed
         FROM
         core_safety_task r
         <!--                INNER  join ( SELECT id,path FROM sys_org WHERE path LIKE CONCAT(( SELECT path FROM sys_org WHERE id =#{orgId}), '%' ) AND deleted = 0 ) o on r.org_Id=o.id-->
         WHERE
-        ymd_date >= #{startDate} and org_path like concat(#{orgPath},'%')
+        ymd_date >= #{date} and org_path like concat(#{orgPath},'%')
         GROUP BY
-        org_id,path
+        org_id,org_path
     </select>
     <select id="monitor" resultType="com.xunmei.core.board.vo.TaskStatisticVo">
         SELECT
         org_id,
-        path as org_path,
+        org_path,
         count( 0 ) AS count,
         SUM( CASE `status` WHEN 2 THEN 1 ELSE 0 END ) AS completed
         FROM
         core_monitoring_retrieval_task r
         <!--                INNER  join ( SELECT id,path FROM sys_org WHERE path LIKE CONCAT(( SELECT path FROM sys_org WHERE id =#{orgId}), '%' ) AND deleted = 0 ) o on r.org_Id=o.id-->
         WHERE
-        ymd_date >= #{startDate} and org_path like concat(#{orgPath},'%')
+        ymd_date >= #{date} and org_path like concat(#{orgPath},'%')
         GROUP BY
-        org_id,path
+        org_id,org_path
     </select>
     <select id="edu" resultType="com.xunmei.core.board.vo.TaskStatisticVo">
         SELECT
         org_id,
-        path as org_path,
+        org_path,
         count( 0 ) AS count,
         SUM( CASE `status` WHEN 4 THEN 1 ELSE 0 END ) AS completed
         FROM
         core_edu_training_task r
         <!--                INNER  join ( SELECT id,path FROM sys_org WHERE path LIKE CONCAT(( SELECT path FROM sys_org WHERE id =#{orgId}), '%' ) AND deleted = 0 ) o on r.org_Id=o.id-->
         WHERE
-        start_date >= #{startDate} and org_path like concat(#{orgPath},'%')
+        start_date >= #{date} and org_path like concat(#{orgPath},'%')
         GROUP BY
-        org_id,path
+        org_id,org_path
     </select>
     <select id="drill" resultType="com.xunmei.core.board.vo.TaskStatisticVo">
         SELECT
         org_id,
-        path as org_path,
+        org_path,
         count( 0 ) AS count,
         SUM( CASE `status` WHEN 4 THEN 1 ELSE 0 END ) AS completed
         FROM
         core_drill_task r
         <!--                INNER  join ( SELECT id,path FROM sys_org WHERE path LIKE CONCAT(( SELECT path FROM sys_org WHERE id =#{orgId}), '%' ) AND deleted = 0 ) o on r.org_Id=o.id-->
         WHERE
-        start_date >= #{startDate} and org_path like concat(#{orgPath},'%')
+        start_date >= #{date} and org_path like concat(#{orgPath},'%')
         GROUP BY
-        org_id,path
+        org_id,org_path
     </select>
     <select id="orgGA38" resultType="com.xunmei.core.board.vo.OrgGA38StatisticVo">
         SELECT o.id                                           as org_id,
@@ -78,7 +77,7 @@
                count(0)                                       AS count,
                SUM(CASE c.org_id WHEN null THEN 0 ELSE 1 END) AS completed
         FROM sys_org o
-                 left join (select distinct org_id sys_org_physical_defense_construction) c on o.id = c.org_id
+                 left join (select distinct org_id from sys_org_physical_defense_construction) c on o.id = c.org_id
         WHERE type = 4
           and deleted = 0
           and o.path like concat((select path from sys_org where id = #{orgId}), '%')
@@ -90,6 +89,6 @@
                sum(case confirm_status when 2 then 1 else 0 end) as unreform,
                sum(case confirm_status when 3 then (case reform_status when null then 0 else 1 end) else 0 end) notQuestion,
                sum(case reform_status when 11 then 1 else 0 end) reformed
-        FROM core_question WHERE submit_time>=#{start} and org_path like CONCAT(#{orgPath},'%');
+        FROM core_question WHERE submit_time>=#{date} and org_path like CONCAT(#{orgPath},'%');
     </select>
 </mapper>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysNfcBindServiceImpl.java

@@ -94,8 +94,8 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
 
     @Override
     public SysNfcBind selectSysNfcBindByCode(String code) {
-        if (StringUtils.isEmpty(code)){
-         return new SysNfcBind();
+        if (StringUtils.isEmpty(code)) {
+            return new SysNfcBind();
         }
         return sysNfcBindMapper.selectSysNfcBindByCode(code);
     }
@@ -129,11 +129,15 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
         if (aLong > 0) {
             throw new ServiceException("该区域和采集点已绑定标签，请勿重复添加");贾武先
         }*/
+        SysNfcBind sysNfcBind1 = this.selectSysNfcBindByCode(sysNfcBind.getCode());
+        if (null != sysNfcBind1) {
+            throw new ServiceException("请勿重复添加nfc");
+        }
         sysNfcBind.setUpdateTime(DateUtils.getNowDate());
         sysNfcBind.setCreateTime(DateUtils.getNowDate());
         sysNfcBind.setDelFlag("0");
         sysNfcBind.setSource("1");
-        if(null==sysNfcBind.getEnable()){
+        if (null == sysNfcBind.getEnable()) {
             sysNfcBind.setSource("2");
             sysNfcBind.setEnable("0");
         }
@@ -167,7 +171,7 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
         queryWrapper.eq("del_flag", 0);
         queryWrapper.eq("code", sysNfcBind.getCode());
         SysNfcBind sysNfcBind1 = baseMapper.selectOne(queryWrapper);
-        if (null!=sysNfcBind1&&(!sysNfcBind1.getId().equals(sysNfcBind.getId()))) {
+        if (null != sysNfcBind1 && (!sysNfcBind1.getId().equals(sysNfcBind.getId()))) {
             throw new ServiceException("该区域和采集点已绑定标签，请勿重复修改");
         }
         sysNfcBind.setUpdateTime(DateUtils.getNowDate());