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

project_data/sql/0.0.9/soc/soc.sql

@@ -83,3 +83,21 @@ INSERT INTO sys_menu (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `comp
 delete from sys_dict_data where dict_type='video_diagnosis_state' and dict_label in ('未知');
 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', 'video_diagnosis_state', NULL, 'default', 'N', '0', '超级管理员', '2024-05-13 11:07:08', '', NULL, NULL);
 
+-- 修改索引类型
+-- 先删除重复的数据
+DELETE
+FROM
+    mediator_video_integrity_check
+WHERE
+        id IN (
+        SELECT * FROM (SELECT
+                           c.id
+                       FROM
+                           mediator_video_integrity_check c
+                               INNER JOIN ( SELECT equipment_code, channel_code FROM mediator_video_integrity_check GROUP BY equipment_code, channel_code HAVING COUNT(*)> 1 ) s ON c.equipment_code = s.equipment_code
+                               AND c.channel_code = s.channel_code) t);
+
+-- 在重建索引
+ALTER TABLE `mediator_video_integrity_check`
+DROP INDEX `idx_code`,
+ADD UNIQUE INDEX `idx_code`(`channel_code`(191), `equipment_code`(191)) USING BTREE;

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysOrg.java

@@ -150,6 +150,10 @@ public class SysOrg extends BaseEntity {
     @ApiModelProperty(value = "机构所属行社")
     private String affiliatedBank;
 
+    @ApiModelProperty(value = "行社之下")
+    @TableField(exist = false)
+    private Boolean underBank ;
+
     /**
      * 子机构
      */

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/constant/CacheConstants.java

@@ -63,6 +63,11 @@ public class CacheConstants
     public static final String ORG_CACHE_LIST_KEY = "sys_org_list";
 
     /**
+     * 所有行社机构缓存
+     */
+    public static final String HS_ORG_CACHE_LIST_KEY = "sys_hs_org_list";
+
+    /**
      * 所有角色缓存
      */
     public static final String ROLE_CACHE_LIST_KEY = "sys_role_list";

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/service/impl/CockpitServiceImpl.java

@@ -47,7 +47,8 @@ public class CockpitServiceImpl implements CockpitService {
         SysOrg org = getOrgThrowIfNull(dto.getOrgId());
         String orgPath = org.getPath();
         List<TaskStatisticVo> list = cockpitMapper.resumption(date, DateUtil.endOfDay(new Date()), orgPath);
-        return taskStatistic(list, org, Arrays.asList(OrgTypeEnum.LIHANG_ZIZHU_YINGHANG.getCode(), OrgTypeEnum.YINGYE_WANGDIAN.getCode()));
+//        return taskStatistic(list, org, Arrays.asList(OrgTypeEnum.LIHANG_ZIZHU_YINGHANG.getCode(), OrgTypeEnum.YINGYE_WANGDIAN.getCode()));
+        return taskStatistic(list, org, Arrays.asList(OrgTypeEnum.YINGYE_WANGDIAN.getCode()));
     }
 
     @Override

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/service/LocalSysFileServiceImpl.java

@@ -340,7 +340,7 @@ public class LocalSysFileServiceImpl implements ISysFileService {
         PdfUtil.createPDFCell(titleFont, table, "调阅人签字", Element.ALIGN_MIDDLE, 4, 1);
         List<String> list = new ArrayList<>();
         list.add(data.getSignImg());
-        dealImageCell(list, table, 1, 70, 40,15,1);
+        dealImageCell(list, table, 1, 80, 30,15,1);
 
         PdfUtil.createPDFCell(titleFont, table, "监控调阅情况", Element.ALIGN_MIDDLE, 19, 1);
 

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -176,7 +176,7 @@ public class PdfUtil {
         createPDFCell(tableFont, table, "总结", Element.ALIGN_MIDDLE, 1, 1);
         createPDFCell(tableFont, table, data.get("note").toString(), Element.ALIGN_LEFT, 5, 1);
         createPDFCell(tableFont, table, "参会人员签字", Element.ALIGN_MIDDLE, 1, 1);
-        dealEduImageCell((List<String>) data.get("signImage"), table, 5, 40, 40);
+        dealEduImageCell((List<String>) data.get("signImage"), table, 5, 80, 30);
         document.add(table);
 
         //第二页
@@ -363,9 +363,9 @@ public class PdfUtil {
 
         //第七行
         createPDFCell(tableFont, table, "审批人签字", Element.ALIGN_MIDDLE, 1, 1);
-        dealImageCell((List<String>) data.get("approveSign"), table, 1, 50, 40, 2, 1);
+        dealImageCell((List<String>) data.get("approveSign"), table, 1, 80, 30, 2, 1);
         createPDFCell(tableFont, table, "登记人签字", Element.ALIGN_MIDDLE, 1, 1);
-        dealImageCell((List<String>) data.get("submitSign"), table, 1, 50, 40, 2, 1);
+        dealImageCell((List<String>) data.get("submitSign"), table, 1, 80, 30, 2, 1);
 //           /statics/2023/12/05/20231205183106A001.png
         //证件图片
         createPDFCell(tableFont, table, "证件图片", Element.ALIGN_MIDDLE, 1, 1);
@@ -445,7 +445,7 @@ public class PdfUtil {
         createPDFCell(tableFont, table, data.get("comment").toString(), Element.ALIGN_LEFT, 5, 1);
         //参会人员签字
         createPDFCell(tableFont, table, "参演人员", Element.ALIGN_MIDDLE, 1, 1);
-        dealEduImageCell((List<String>) data.get("signImage"), table, 5, 40, 40);
+        dealEduImageCell((List<String>) data.get("signImage"), table, 5, 80, 30);
         document.add(table);
 
         //第二页
@@ -676,7 +676,7 @@ public class PdfUtil {
         PdfUtil.createPDFCell(tableFont, table, "主查人签字", Element.ALIGN_MIDDLE, 3, 1);
         List<String> list = new ArrayList<>();
         list.add(data.getSignImg());
-        dealEduImageCell(list, table, 1, 70, 40);
+        dealEduImageCell(list, table, 1, 80, 30);
 
         PdfUtil.createPDFCell(tableFont, table, "检查工作情况", Element.ALIGN_MIDDLE, 14, 1);
 

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.LineHandler;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
@@ -125,11 +126,44 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             }
             page = baseMapper.selectOrgList(page, org);
         }
+        dealTableData(page);
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);
 
     }
 
+    private void dealTableData(Page<SysOrg> page)
+    {
+        if(ObjectUtil.isEmpty(page.getRecords()))
+        {
+            return ;
+        }
+       List<SysOrgVO> hsOrgList= getHSOrgCache();
+        page.getRecords().stream().forEach(x->{
+            if(ObjectUtil.isEmpty(x.getPath()))
+            {
+                return;
+            }
+            if(Arrays.stream(x.getPath().split("-")).anyMatch(id->hsOrgList.stream().anyMatch(hsOrg->ObjectUtil.equal(id,hsOrg.getId().toString()))))
+            {
+                x.setUnderBank(true);
+            }
+        });
+
+    }
+
+    private List<SysOrgVO> getHSOrgCache() {
+        List<SysOrgVO> cacheList = null;
+        Boolean isOk = RedisUtils.hasKey(CacheConstants.HS_ORG_CACHE_LIST_KEY);
+        if (!isOk) {
+            cacheList = loadingOrgCache();
+        } else {
+            cacheList = RedisUtils.getCacheList(CacheConstants.HS_ORG_CACHE_LIST_KEY);
+        }
+
+        return cacheList;
+    }
+
     @Override
     public List<OrgPhysicalDefenseConstructionExport> excel(SysOrg dept) {
 
@@ -748,14 +782,17 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     @Override
     public List<SysOrgVO> loadingOrgCache() {
         List<SysOrgVO> sysOrgVOS = baseMapper.selectSysOrgVOList();
+        List<SysOrgVO> hsOrgs = sysOrgVOS.stream().filter(x -> ObjectUtil.equal(x.getType(), 3)).collect(Collectors.toList());
         clearOrgCache();
         RedisUtils.setCacheList(CacheConstants.ORG_CACHE_LIST_KEY, sysOrgVOS);
+        RedisUtils.setCacheList(CacheConstants.HS_ORG_CACHE_LIST_KEY, hsOrgs);
         return sysOrgVOS;
     }
 
     @Override
     public void clearOrgCache() {
         RedisUtils.deleteObject(CacheConstants.ORG_CACHE_LIST_KEY);
+        RedisUtils.deleteObject(CacheConstants.HS_ORG_CACHE_LIST_KEY);
         //redisService.deleteObject(CacheConstants.ORG_CACHE_LIST_KEY);
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/OwnershipConverter.java

@@ -32,9 +32,12 @@ public class OwnershipConverter implements Converter<Integer> {
             return new CellData("部分自有+部分租赁");
         }else if (null != s && s == 2){
             return new CellData("自有");
-        }else {
+        }else if (null != s && s == 3){
             return new CellData("租赁");
         }
+        else{
+            return new CellData("未设置");
+        }
 
     }
 }

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

@@ -826,7 +826,8 @@ and
                             1,
                             0
                 ) AS complianceStatus,
-            a.date_of_compliance AS complianceDate,
+            IFNULL(SUBSTR( a.date_of_compliance, 1, 10 ), '' ) AS complianceDate,
+<!--            a.date_of_compliance AS complianceDate,-->
             IF
                 (
                             IF
@@ -836,7 +837,8 @@ and
                             NULL,
                             a.reason
                 ) AS reason,
-            a.date_of_complete AS completeDate,
+            IFNULL(SUBSTR( a.date_of_complete, 1, 10 ), '' ) AS completeDate,
+<!--            a.date_of_complete AS completeDate,-->
             c.address as address,
             c.affiliated_area as city,
             c.affiliated_bank as orgName,
@@ -1027,6 +1029,7 @@ and
             1=1
           and b.deleted = 0
           and b.is_lock = 0
+          and b.type = 4
           and b.path LIKE concat(#{orgPath}, '%')
     </select>
     <select id="getCertificate" resultType="java.util.Map">