Merge branch 'feat-20220610-displaytasktype' into temp-pre

db/v2022/4single_member_settle_same_amount_in_several_months.sql

@@ -10,20 +10,20 @@ DROP TABLE IF EXISTS `single_member_settle_same_amount_in_several_months`;
 CREATE TABLE `single_member_settle_same_amount_in_several_months`
 (
     `record_id`               INT UNSIGNED AUTO_INCREMENT COMMENT 'id',
-    `note_id`                 INT UNSIGNED NULL COMMENT '积分包计算记录id',
-    `realname`                VARCHAR(32)  NULL COMMENT '用户名称',
-    `username`                VARCHAR(11)  NULL COMMENT '用户名',
-    `id_number`               VARCHAR(18)  NULL COMMENT '身份证',
-    `dept_id`                 INT          NULL COMMENT '结算企业id',
-    `dept_name`               VARCHAR(64)  NULL COMMENT '结算企业名称',
-    `settle_amount`           DECIMAL      NULL COMMENT '结算金额',
-    `sub_to_gig_time`         DATETIME     NULL COMMENT '结算时间',
-    `settle_state`            VARCHAR(16)  NULL COMMENT '结算企业名称',
-    `sub_type_name`           VARCHAR(16)  NULL COMMENT '结算渠道名称',
-    `package_name`            VARCHAR(64)  NULL COMMENT '积分包名称',
-    `settle_note_create_time` DATETIME     NULL COMMENT '结算记录创建时间',
-    `period`                  INT UNSIGNED NULL COMMENT '统计周期',
-    `create_time`             DATETIME     NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `note_id`                 INT UNSIGNED   NULL COMMENT '积分包计算记录id',
+    `realname`                VARCHAR(32)    NULL COMMENT '用户名称',
+    `username`                VARCHAR(11)    NULL COMMENT '用户名',
+    `id_number`               VARCHAR(18)    NULL COMMENT '身份证',
+    `dept_id`                 INT            NULL COMMENT '结算企业id',
+    `dept_name`               VARCHAR(64)    NULL COMMENT '结算企业名称',
+    `settle_amount`           DECIMAL(20, 2) NULL COMMENT '结算金额',
+    `sub_to_gig_time`         DATETIME       NULL COMMENT '结算时间',
+    `settle_state`            VARCHAR(16)    NULL COMMENT '结算企业名称',
+    `sub_type_name`           VARCHAR(16)    NULL COMMENT '结算渠道名称',
+    `package_name`            VARCHAR(64)    NULL COMMENT '积分包名称',
+    `settle_note_create_time` DATETIME       NULL COMMENT '结算记录创建时间',
+    `period`                  INT UNSIGNED   NULL COMMENT '统计周期',
+    `create_time`             DATETIME       NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     PRIMARY KEY (`record_id`) USING BTREE
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='单人连续多月结算相同金额';

db/v2022/5single_member_settle_amount_overrun_in_several_months.sql

@@ -10,20 +10,20 @@ DROP TABLE IF EXISTS `single_member_settle_amount_overrun_in_several_months`;
 CREATE TABLE `single_member_settle_amount_overrun_in_several_months`
 (
     `record_id`               INT UNSIGNED AUTO_INCREMENT COMMENT 'id',
-    `note_id`                 INT UNSIGNED NULL COMMENT '积分包计算记录id',
-    `realname`                VARCHAR(32)  NULL COMMENT '用户名称',
-    `username`                VARCHAR(11)  NULL COMMENT '用户名',
-    `dept_id`                 INT          NULL COMMENT '结算企业id',
-    `dept_name`               VARCHAR(64)  NULL COMMENT '结算企业名称',
-    `settle_amount`           DECIMAL      NULL COMMENT '结算金额',
-    `sub_to_gig_time`         DATETIME     NULL COMMENT '结算时间',
-    `settle_state`            VARCHAR(16)  NULL COMMENT '结算企业名称',
-    `sub_type_name`           VARCHAR(16)  NULL COMMENT '结算渠道名称',
-    `package_name`            VARCHAR(64)  NULL COMMENT '积分包名称',
-    `settle_note_create_time` DATETIME     NULL COMMENT '结算记录创建时间',
-    `period`                  INT UNSIGNED NULL COMMENT '统计周期',
-    `platform_limit`          DECIMAL      NULL COMMENT '结算限制',
-    `create_time`             DATETIME     NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `note_id`                 INT UNSIGNED   NULL COMMENT '积分包计算记录id',
+    `realname`                VARCHAR(32)    NULL COMMENT '用户名称',
+    `username`                VARCHAR(11)    NULL COMMENT '用户名',
+    `dept_id`                 INT            NULL COMMENT '结算企业id',
+    `dept_name`               VARCHAR(64)    NULL COMMENT '结算企业名称',
+    `settle_amount`           DECIMAL(20, 2) NULL COMMENT '结算金额',
+    `sub_to_gig_time`         DATETIME       NULL COMMENT '结算时间',
+    `settle_state`            VARCHAR(16)    NULL COMMENT '结算企业名称',
+    `sub_type_name`           VARCHAR(16)    NULL COMMENT '结算渠道名称',
+    `package_name`            VARCHAR(64)    NULL COMMENT '积分包名称',
+    `settle_note_create_time` DATETIME       NULL COMMENT '结算记录创建时间',
+    `period`                  INT UNSIGNED   NULL COMMENT '统计周期',
+    `platform_limit`          DECIMAL        NULL COMMENT '结算限制',
+    `create_time`             DATETIME       NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     PRIMARY KEY (`record_id`) USING BTREE
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='单人连续多月结算额超标';

db/v2022/6single_ent_settle_same_amount_for_members_in_current_month.sql

@@ -10,21 +10,21 @@ DROP TABLE IF EXISTS `single_ent_settle_same_amount_for_members_in_current_month
 CREATE TABLE `single_ent_settle_same_amount_for_members_in_current_month`
 (
     `record_id`               INT UNSIGNED AUTO_INCREMENT COMMENT 'id',
-    `note_id`                 INT UNSIGNED NULL COMMENT '积分包计算记录id',
-    `realname`                VARCHAR(32)  NULL COMMENT '用户名称',
-    `username`                VARCHAR(11)  NULL COMMENT '用户名',
-    `id_number`               VARCHAR(18)  NULL COMMENT '身份证',
-    `dept_id`                 INT          NULL COMMENT '结算企业id',
-    `dept_name`               VARCHAR(64)  NULL COMMENT '结算企业名称',
-    `settle_amount`           DECIMAL      NULL COMMENT '结算金额',
-    `sub_to_gig_time`         DATETIME     NULL COMMENT '结算时间',
-    `settle_state`            VARCHAR(16)  NULL COMMENT '结算企业名称',
-    `sub_type_name`           VARCHAR(16)  NULL COMMENT '结算渠道名称',
-    `package_name`            VARCHAR(64)  NULL COMMENT '积分包名称',
-    `settle_note_create_time` DATETIME     NULL COMMENT '结算记录创建时间',
-    `period`                  INT UNSIGNED NULL COMMENT '统计周期',
-    `member_count`            INT UNSIGNED NULL COMMENT '风控人数',
-    `create_time`             DATETIME     NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `note_id`                 INT UNSIGNED   NULL COMMENT '积分包计算记录id',
+    `realname`                VARCHAR(32)    NULL COMMENT '用户名称',
+    `username`                VARCHAR(11)    NULL COMMENT '用户名',
+    `id_number`               VARCHAR(18)    NULL COMMENT '身份证',
+    `dept_id`                 INT            NULL COMMENT '结算企业id',
+    `dept_name`               VARCHAR(64)    NULL COMMENT '结算企业名称',
+    `settle_amount`           DECIMAL(20, 2) NULL COMMENT '结算金额',
+    `sub_to_gig_time`         DATETIME       NULL COMMENT '结算时间',
+    `settle_state`            VARCHAR(16)    NULL COMMENT '结算企业名称',
+    `sub_type_name`           VARCHAR(16)    NULL COMMENT '结算渠道名称',
+    `package_name`            VARCHAR(64)    NULL COMMENT '积分包名称',
+    `settle_note_create_time` DATETIME       NULL COMMENT '结算记录创建时间',
+    `period`                  INT UNSIGNED   NULL COMMENT '统计周期',
+    `member_count`            INT UNSIGNED   NULL COMMENT '风控人数',
+    `create_time`             DATETIME       NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     PRIMARY KEY (`record_id`) USING BTREE
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='单人连续多月结算相同金额';

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskTypeController.java

@@ -129,7 +129,7 @@ public class WmTaskTypeController {
 		LambdaQueryWrapper<WmTaskType> queryWrapper ;
 		if (wmTaskType.getRuleId() != null){
 			List<String> noDisplayTaskTypeNameList = Arrays.asList("专家咨询", "受试者管理", "医学撰写", "受试者招募", "数据管理",
-					"统计分析", "临床监察", "通用", "患者教育");
+					"统计分析", "临床监察", "患者教育");
 			queryWrapper = Wrappers.<WmTaskType>lambdaQuery()
 					.eq(WmTaskType::getRuleId, wmTaskType.getRuleId())
 					.notIn(WmTaskType::getTaskTypeName, noDisplayTaskTypeNameList);

hnqz-visual/hnqz-daemon-quartz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -76,8 +76,8 @@
 		LEFT JOIN sys_user u ON sps.user_id = u.user_id
 		LEFT JOIN sys_dept sd ON sp.send_package_dept_id = sd.dept_id
 		<where>
-
-			sp.id IN
+			sd.name NOT IN ('上海问云生物科技有限公司', '北京遥领医疗科技有限公司')
+			AND sp.id IN
 			<foreach collection="packageIds" index="idx" item="id" separator="," open="(" close=")">
 				#{id}
 			</foreach>