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

project_data/sql/0.0.3/soc/soc.sql

@@ -191,6 +191,9 @@ update sys_menu set `menu_name`='布撤防情况跟踪',parent_id=2000 WHERE  `m
 UPDATE `sys_menu` SET `menu_name` = '履职任务下发' WHERE menu_name='履职计划管理';
 UPDATE `sys_menu` SET `menu_name` = '检查任务下发' WHERE menu_name='检查计划管理';
 UPDATE `sys_menu` SET `menu_name` = '检查登记跟踪' WHERE menu_name='检查任务管理';
+UPDATE `sys_menu` SET `menu_name` = '日常履职' WHERE menu_name='日常安全履职';
+UPDATE `sys_menu` SET `menu_name` = '安全检查' WHERE menu_name='安全检查管理';
+UPDATE `sys_menu` SET `menu_name` = '基础信息' WHERE menu_name='安保基础信息';
 -- 机构类型字典变更
 DELETE FROM `sys_dict_data` WHERE `dict_type`='sys_org_type';
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 900, '省联社', '1', 'sys_org_type', NULL, 'default', 'N', '0', '何悦', '2023-08-16 17:51:17', '何悦', '2023-08-24 10:35:12', NULL);
@@ -203,6 +206,12 @@ INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 500, '网点业务库', '8', 'sys_org_type', NULL, 'default', 'N', '0', '超级管理员', '2023-09-12 19:57:55', '超级管理员', '2023-09-15 18:18:44', NULL);
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 400, '保管箱库', '7', 'sys_org_type', NULL, 'default', 'N', '0', '超级管理员', '2023-09-15 17:10:47', '', NULL, NULL);
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 1000, '其他', '9', 'sys_org_type', NULL, 'default', 'N', '0', '超级管理员', '2023-09-17 00:13:26', '超级管理员', '2023-09-17 00:13:37', NULL);
+DELETE FROM `sys_dict_data` WHERE `dict_type`='org_platform_brand';
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 1, '大华', '1', 'org_platform_brand', NULL, 'default', 'N', '0', '超级管理员', '2023-09-04 15:25:09', '省联社账号', '2023-11-01 10:44:47', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 2, '恒通', '2', 'org_platform_brand', NULL, 'default', 'N', '0', '超级管理员', '2023-09-04 15:25:18', '省联社账号', '2023-11-01 10:44:53', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 3, '讯美', '3', 'org_platform_brand', NULL, 'default', 'N', '0', '超级管理员', '2023-09-04 15:25:25', '省联社账号', '2023-11-01 10:45:01', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 4, '天跃', '4', 'org_platform_brand', NULL, 'default', 'N', '0', '超级管理员', '2023-09-04 15:25:34', '省联社账号', '2023-11-01 10:45:18', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 5, '海康威视', '5', 'org_platform_brand', NULL, 'default', 'N', '0', '超级管理员', '2023-09-04 15:25:43', '省联社账号', '2023-11-01 10:45:26', NULL);
 
 -- 预案演练菜单名称变更
 UPDATE sys_menu set menu_name ='预案演练' WHERE menu_name ='预案演练管理';

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/vo/CoreMonitoringRetrievalTaskExcelVo.java

@@ -104,7 +104,7 @@ public class CoreMonitoringRetrievalTaskExcelVo {
     private Date endTime;
 
     @ExcelIgnore
-    @ExcelProperty("异常数")
+    @ExcelProperty("异常数量")
     private Integer exceptionCount;
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluateTaskController.java

@@ -18,6 +18,9 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 外包评价任务Controller
  *
@@ -52,7 +55,7 @@ public class CoreEvaluateTaskController extends BaseController {
     @ApiOperation(value = "统计")
     @RequiresPermissions("core:evaluateTask:list")
     @GetMapping("/statistics")
-    public TableDataInfo statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
+    public List<Map> statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
         return coreEvaluateTaskService.statistics(evaluateTaskStatisticsDTO);
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluateTaskMapper.java

@@ -72,6 +72,6 @@ public interface CoreEvaluateTaskMapper extends BaseMapper<CoreEvaluateTask> {
     Page<CoreEvaluateTaskVO> selectPageList(@Param("page") Page<CoreEvaluateTaskVO> page, @Param("request") EvaluateTaskDTO request);
     Page<CoreEvaluateTaskVO> selectAppPageList(@Param("page") Page<CoreEvaluateTaskVO> page, @Param("request") EvaluateTaskDTO request);
     Page<Map> statistics(@Param("page") Page<Map> page, @Param("request") EvaluateTaskStatisticsDTO request);
-
+List<Map>statisticsAll(@Param("request") EvaluateTaskStatisticsDTO request);
     List<Map> getContentByTaskId(@Param("id") Long id);
 }

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

@@ -95,5 +95,5 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      * @param evaluateTaskDTO
      * @return
      */
-    TableDataInfo<Map> statistics(EvaluateTaskStatisticsDTO evaluateTaskDTO);
+    List<Map> statistics(EvaluateTaskStatisticsDTO evaluateTaskDTO);
 }

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

@@ -107,7 +107,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
     }
 
     @Override
-    public TableDataInfo<Map> statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
+    public List<Map> statistics(EvaluateTaskStatisticsDTO evaluateTaskStatisticsDTO) {
         Page<Map> page;
         //分页
         if (evaluateTaskStatisticsDTO.getPageNum() != null && evaluateTaskStatisticsDTO.getPageSize() != null) {
@@ -117,8 +117,8 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         }
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(evaluateTaskStatisticsDTO.getOrgId(), SecurityConstants.INNER);
         evaluateTaskStatisticsDTO.setOrgPath(sysOrg.getPath());
-        Page<Map> statistics = baseMapper.statistics(page, evaluateTaskStatisticsDTO);
-        List<Map> rows = statistics.getRecords();
+        List<Map> rows = baseMapper.statisticsAll(evaluateTaskStatisticsDTO);
+
         for (int i = 0; i < rows.size(); i++) {
             Object id = rows.get(i).get("id");
             List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) id);
@@ -132,7 +132,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
                 rows.get(i).put("合计", total);
             }
         }
-        return TableDataInfo.build(statistics);
+        return rows;
     }
 
     @Override

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/CoreSafetyTask.java

@@ -44,7 +44,8 @@ public class CoreSafetyTask extends BaseEntity {
     private String roleName;
     @TableField(exist = false)
     private String submitName;
-
+    @TableField(exist = false)
+    private List<Date> range;
     /**
      * 标题
      */

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafetyTaskServiceImpl.java

@@ -75,8 +75,14 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
             List<SafetyPlanRoleVo> planRoles=coreSafecheckPlanToRoleMapper.selectRoles(planIds);
             page.getRecords().forEach(r->{
                 List<SafetyPlanRoleVo> roles=planRoles.stream().filter(pr-> ObjectUtil.equal(r.getPlanId(),pr.getPlanId())).collect(Collectors.toList());
-                r.setRoles(roles);
+                if(coreSafetyTask.getRoleId()!=null){
+                    roles = roles.stream().filter(e -> e.getRoleId().equals(coreSafetyTask.getRoleId())).collect(Collectors.toList());
+                        r.setRoles(roles);
+                }else {
+                    r.setRoles(roles);
+                }
             });
+            page.setRecords(page.getRecords().stream().filter(e -> e.getRoles().size() > 0).collect(Collectors.toList()));
         }
 
         //抓换为TableDataInfo适配前端

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -184,6 +184,44 @@
         </if>
         GROUP BY a.id
     </select>
+    <select id="statisticsAll" resultType="java.util.Map">
+        SELECT
+        a.id,
+        a.org_name,
+        GROUP_CONCAT( c.role_name ) as roleName,
+        a.evaluate_name,
+        a.start_time,
+        a.end_time,
+        a.evaluate_by,
+        a.complete_time,
+        a.`status`,
+        IFNULL( SUM( d.score )/ COUNT( d.id ), 0 )  AS averageScore
+        FROM
+        core_evaluate_task a
+        LEFT JOIN core_evaluate_role b ON b.evaluate_id = a.plan_id
+        LEFT JOIN sys_role c ON c.id = b.role_id
+        LEFT JOIN core_evaluate_task_user e ON e.task_id=a.id
+        LEFT JOIN core_evaluate_task_user_content d on d.task_user_id=e.id
+        WHERE
+        a. is_deleted =0
+        <if test="request.orgId != null ">
+            and a.org_id = #{request.orgId}
+        </if>
+        <if test="request.orgPath != null  and request.orgPath != ''">
+            and a.org_path like concat( #{request.orgPath}, '%')
+        </if>
+        <if test="request.evaluateName != null  and request.evaluateName != ''">
+            and a.evaluate_name like concat('%', #{request.evaluateName}, '%')
+        </if>
+
+        <if test="request.status != null and '' neq request.status">
+            and a.status = #{request.status}
+        </if>
+        <if test="request.date != null and request.date != ''">
+            and e.complete_time like concat( #{request.date}, '%')
+        </if>
+        GROUP BY a.id
+    </select>
 
 
     <insert id="insertCoreEvaluateTask" parameterType="com.xunmei.core.evaluate.domain.CoreEvaluateTask">

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -230,10 +230,15 @@
         <if test="task.status != null  and task.status != ''">
             and t.status =#{task.status}
         </if>
-
+<!--        <if test="task.roleId != null  and task.roleId != ''">-->
+<!--            and t.role_id =#{task.roleId}-->
+<!--        </if>-->
         <if test="task.checkSub==false">
             and t.check_org_id=#{task.orgId}
         </if>
+        <if test="task.range !=null and task.range.size==2">
+           and t.plan_start_time>=#{task.range[0]} and t.plan_start_time &lt; #{task.range[1]}
+        </if>
         <if test="task.checkSub==true">
             and t.check_org_id in (select id from sys_org
             where path like concat((select path from sys_org where id=#{task.orgId}),'%'))

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserInformationController.java

@@ -1,6 +1,7 @@
 package com.xunmei.system.controller;
 
 import com.xunmei.system.api.domain.SysUserInformation;
+import com.xunmei.system.dto.SysUserInformationDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -64,7 +65,7 @@ public class SysUserInformationController extends BaseController {
     @RequiresPermissions("system:information:edit")
     @Log(title = "人员管理扩展", businessType = BusinessType.UPDATE)
     @PutMapping("/extendUser")
-    public AjaxResult extendUser(@RequestBody SysUserInformation sysUserInformation) {
+    public AjaxResult extendUser(@RequestBody SysUserInformationDTO sysUserInformation) {
         return toAjax(sysUserInformationService.extendUser(sysUserInformation));
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/vo/SysUserInformationVO.java

@@ -0,0 +1,13 @@
+package com.xunmei.system.domain.vo;
+
+import com.xunmei.system.api.domain.SysUserInformation;
+import lombok.Data;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/11/2
+ */
+@Data
+public class SysUserInformationVO extends SysUserInformation {
+    private String idCard;
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/dto/SysUserInformationDTO.java

@@ -0,0 +1,13 @@
+package com.xunmei.system.dto;
+
+import com.xunmei.system.api.domain.SysUserInformation;
+import lombok.Data;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/11/2
+ */
+@Data
+public class SysUserInformationDTO extends SysUserInformation {
+    private String idCard;
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysUserInformationMapper.java

@@ -3,6 +3,7 @@ package com.xunmei.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.api.domain.SysUserInformation;
+import com.xunmei.system.domain.vo.SysUserInformationVO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -22,7 +23,7 @@ public interface SysUserInformationMapper extends BaseMapper<SysUserInformation>
      * @return 【请填写功能名称】
      */
      SysUserInformation selectSysUserInformationById(Long id);
- SysUserInformation  getInformationByUserId(Long userId);
+    SysUserInformationVO getInformationByUserId(Long userId);
     /**
      * 查询【请填写功能名称】列表
      *

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

@@ -4,6 +4,8 @@ package com.xunmei.system.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.system.api.domain.SysUserInformation;
+import com.xunmei.system.domain.vo.SysUserInformationVO;
+import com.xunmei.system.dto.SysUserInformationDTO;
 
 import java.util.List;
 
@@ -22,9 +24,9 @@ public interface ISysUserInformationService extends IService<SysUserInformation>
      */
     SysUserInformation selectSysUserInformationById(Long id);
 
-    SysUserInformation getInformationByUserId(Long id);
+    SysUserInformationVO getInformationByUserId(Long id);
 
-    int extendUser(SysUserInformation sysUserInformation);
+    int extendUser(SysUserInformationDTO sysUserInformation);
 
     /**
      * 查询【用户扩展信息】列表

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

@@ -7,9 +7,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.domain.SysUserInformation;
 import com.xunmei.system.api.model.LoginUser;
+import com.xunmei.system.domain.vo.SysUserInformationVO;
+import com.xunmei.system.dto.SysUserInformationDTO;
 import com.xunmei.system.mapper.SysUserInformationMapper;
+import com.xunmei.system.mapper.SysUserMapper;
 import com.xunmei.system.service.ISysOrgService;
 import com.xunmei.system.service.ISysUserInformationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +33,8 @@ public class SysUserInformationServiceImpl extends ServiceImpl<SysUserInformatio
     private SysUserInformationMapper sysUserInformationMapper;
     @Autowired
     private ISysOrgService orgService;
-
+@Autowired
+private SysUserMapper sysUserMapper;
     @Override
     public TableDataInfo<SysUserInformation> selectPage(SysUserInformation sysUserInformation) {
 
@@ -78,7 +83,7 @@ public class SysUserInformationServiceImpl extends ServiceImpl<SysUserInformatio
     }
 
     @Override
-    public SysUserInformation getInformationByUserId(Long id) {
+    public SysUserInformationVO getInformationByUserId(Long id) {
         return sysUserInformationMapper.getInformationByUserId(id);
     }
 public Date getTime(Date time){
@@ -88,7 +93,7 @@ public Date getTime(Date time){
     return calendar.getTime();
 }
     @Override
-    public int extendUser(SysUserInformation sysUserInformation) {
+    public int extendUser(SysUserInformationDTO sysUserInformation) {
         SysUserInformation informationByUserId = sysUserInformationMapper.getInformationByUserId(sysUserInformation.getUserId());
         int i = 0;
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -104,7 +109,9 @@ public Date getTime(Date time){
             sysUserInformation.setUpdateBy(loginUser.getUsername());
             i = sysUserInformationMapper.insert(sysUserInformation);
         }
-
+        SysUser sysUser = sysUserMapper.selectById(sysUserInformation.getUserId());
+        sysUser.setCard(sysUserInformation.getIdCard());
+        sysUserMapper.updateById(sysUser);
         return i;
     }
 

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserInformationMapper.xml

@@ -94,10 +94,14 @@
             <include refid="selectSysUserInformationVo"/>
             where id = #{id}
     </select>
-    <select id="getInformationByUserId" resultType="com.xunmei.system.api.domain.SysUserInformation">
-        <include refid="selectSysUserInformationVo"/>
+    <select id="getInformationByUserId" resultType="com.xunmei.system.domain.vo.SysUserInformationVO">
+        SELECT
+            a.*,b.card AS idCard
+        FROM
+            sys_user_information a
+                LEFT JOIN sys_user b ON a.user_id = b.id
         WHERE
-            user_id=#{userId}
+            a.user_id=#{userId}
     </select>
 
     <insert id="insertSysUserInformation" parameterType="com.xunmei.system.api.domain.SysUserInformation">