Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

project_data/sql/0.0.3/soc/soc.sql

@@ -388,19 +388,19 @@ ALTER TABLE  core_safetycheck_rule MODIFY COLUMN create_by varchar(255) CHARACTE
 
 
 DELIMITER ??
-DROP PROCEDURE IF EXISTS schema_change ?? 
+DROP PROCEDURE IF EXISTS schema_change ??
 	CREATE PROCEDURE schema_change () BEGIN
 
 	-- 履职表增加次数
 	IF
         NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption' AND COLUMN_NAME = 'times' ) THEN
-        ALTER TABLE `core_resumption` 
+        ALTER TABLE `core_resumption`
 			ADD COLUMN `times` smallint NULL COMMENT '第几次' AFTER `role_id`;
     END IF;
 		-- 履职表增加提交人
 	IF
         NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption' AND COLUMN_NAME = 'submitor_id' ) THEN
-		ALTER TABLE `soc`.`core_resumption` 
+		ALTER TABLE `soc`.`core_resumption`
 			ADD COLUMN `submitor_id` bigint NULL COMMENT '提交人id' AFTER `submit_time`,
 			ADD COLUMN `submitor_name` varchar(32) NULL COMMENT '提交人姓名' AFTER `submitor_id`;
     END IF;
@@ -436,7 +436,21 @@ DROP PROCEDURE IF EXISTS schema_change ??
 			ADD COLUMN `status_updator_id` bigint NULL DEFAULT NULL COMMENT '上报人id' AFTER `status_update_time`,
 			ADD COLUMN `status_updator_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '上报人姓名' AFTER `status_updator_id`;
 	END IF;
-END ??
+
+    -- 安全指数机构分数表增加机构名称字段
+    IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'core_safe_month_score'
+                    AND column_name = 'org_name') THEN
+        alter table core_safe_month_score
+            add org_name varchar(125) null comment '机构名称' after org_id;
+    END IF;
+
+
+
+
+    END ??
 DELIMITER;
 CALL schema_change ();
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/safetyindex/domain/CoreSafeMonthScore.java

@@ -36,6 +36,10 @@ public class CoreSafeMonthScore{
     @ApiModelProperty(value = "机构id")
     private Long orgId;
 
+    @TableField(value  = "org_name")
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+
     @TableField(value  = "data_year")
     @ApiModelProperty(value = "数据所在年")
     private Integer dataYear;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafetyExceptionDataServiceImpl.java

@@ -256,6 +256,8 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
             monthScore.setDataYear(year);
             monthScore.setId(IdWorker.getId());
             monthScore.setOrgId(o.getId());
+            monthScore.setOrgName(o.getName());
+            monthScore.setOrgPath(o.getPath());
             monthScore.setReleaseStatus(1);
             List<CoreSafetyDeductData> listdata = safeSourceDataList.get(o.getId());
             double deduct = 0;
@@ -632,7 +634,6 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
     }
 
     private CoreSafetySourceData doNewSafetySourceData(SafeIndexRuleCountVo indexConfigCountVo, Long orgId, double deductScore, int year, int month, int time) {
-        List<SysOrgVO> orgList = RedisUtils.getCacheList(CacheConstants.ORG_CACHE_LIST_KEY);
         CoreSafetySourceData safeSourceData = new CoreSafetySourceData();
         safeSourceData.setId(IdWorker.getId());
         safeSourceData.setRuleId(indexConfigCountVo.getRuleId());