Merge remote-tracking branch 'origin/temp-pre' into temp-pre

db/v2.0/220531.sql

@@ -0,0 +1,54 @@
+-- 新增三种任务类型
+INSERT INTO wm_task_type (id, task_type_name, task_type_level, task_score_start, task_score_end, score, task_ent_id,
+                          durgent_id, level1_id, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user,
+                          update_time, update_user, status, base_id, real_flag, rule_id, parent_id)
+VALUES (34, '医院患者教育培训', '1', 0, 2000, 2000, null, null, null, null, 0, '0', 1, '2022-05-31 14:56:55', null, null, null,
+        0, '培训', null, '1', 'p-16');
+INSERT INTO wm_task_type (id, task_type_name, task_type_level, task_score_start, task_score_end, score, task_ent_id,
+                          durgent_id, level1_id, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user,
+                          update_time, update_user, status, base_id, real_flag, rule_id, parent_id)
+VALUES (35, '药店药师培训', '1', 0, 2000, 2000, null, null, null, null, 0, '0', 1, '2022-05-31 14:56:58', null, null, null, 0,
+        '培训', null, '1', 'p-16');
+INSERT INTO wm_task_type (id, task_type_name, task_type_level, task_score_start, task_score_end, score, task_ent_id,
+                          durgent_id, level1_id, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user,
+                          update_time, update_user, status, base_id, real_flag, rule_id, parent_id)
+VALUES (36, '商业公司培训', '1', 0, 2000, 2000, null, null, null, null, 0, '0', 1, '2022-05-31 14:56:59', null, null, null, 0,
+        '培训', null, '1', 'p-16');
+
+-- 任务类型培训-小程序页面字段配置
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '36', 'temp32', '关联积分包', 2, 'domain', 1, 200, null, null, 'package_list', '1', null, '0', '0', 1, '2021-01-17 10:54:59', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '36', 'temp2', '培训主题', 3, 'text', 2, 20, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:28', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '36', 'temp3', '培训类型', 1, 'select', 1, 200, null, '', 'training_type', '1', null, '0', '0', 1, '2020-07-22 00:42:12', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '36', 'temp4', '培训时间', 4, 'datetime', 1, 200, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:30', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '36', 'temp5', '培训议程', 7, 'img', 1, 20, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:31', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '36', 'temp6', '培训签到表', 8, 'img', 1, 5, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:32', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '36', 'temp7', '现场照片', 9, 'img', 1, 5, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:33', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '36', 'temp8', '外采费用', 12, 'money', 1, 200, null, '', '', '0', null, '0', '0', 1, '2020-07-20 22:34:35', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '36', 'temp9', '培训总结', 13, 'longtext', 3, 100, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:34', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '36', 'temp31', '位置打卡', 6, 'map', 1, 200, null, null, null, '0', null, '0', '0', 1, '2021-01-10 21:54:36', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '36', 'temp10', '培训内容', 10, 'img', 2, 20, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:31', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '36', 'temp13', '主讲人', 5, 'text', 2, 20, null, '', '', '1', null, '0', '0', 1, '2020-07-22 00:42:12', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '35', 'temp32', '关联积分包', 2, 'domain', 1, 200, null, null, 'package_list', '1', null, '0', '0', 1, '2021-01-17 10:54:59', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '35', 'temp2', '培训主题', 3, 'text', 2, 20, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:28', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '35', 'temp3', '培训类型', 1, 'select', 1, 200, null, '', 'training_type', '1', null, '0', '0', 1, '2020-07-22 00:42:12', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '35', 'temp4', '培训时间', 4, 'datetime', 1, 200, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:30', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '35', 'temp5', '培训议程', 7, 'img', 1, 20, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:31', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '35', 'temp6', '培训签到表', 8, 'img', 1, 5, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:32', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '35', 'temp7', '现场照片', 9, 'img', 1, 5, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:33', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '35', 'temp8', '外采费用', 12, 'money', 1, 200, null, '', '', '0', null, '0', '0', 1, '2020-07-20 22:34:35', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '35', 'temp9', '培训总结', 13, 'longtext', 3, 100, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:34', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '35', 'temp31', '位置打卡', 6, 'map', 1, 200, null, null, null, '0', null, '0', '0', 1, '2021-01-10 21:54:36', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '35', 'temp10', '培训内容', 10, 'img', 2, 20, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:31', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '35', 'temp13', '主讲人', 5, 'text', 2, 20, null, '', '', '1', null, '0', '0', 1, '2020-07-22 00:42:12', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '34', 'temp13', '主讲人', 5, 'text', 2, 20, null, '', '', '1', null, '0', '0', 1, '2020-07-22 00:42:12', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '34', 'temp10', '培训内容', 10, 'img', 2, 20, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:31', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '34', 'temp31', '位置打卡', 6, 'map', 1, 200, null, null, null, '0', null, '0', '0', 1, '2021-01-10 21:54:36', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '34', 'temp9', '培训总结', 13, 'longtext', 3, 100, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:34', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '34', 'temp8', '外采费用', 12, 'money', 1, 200, null, '', '', '0', null, '0', '0', 1, '2020-07-20 22:34:35', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '34', 'temp7', '现场照片', 9, 'img', 1, 5, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:33', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '34', 'temp6', '培训签到表', 8, 'img', 1, 5, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:32', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '34', 'temp5', '培训议程', 7, 'img', 1, 20, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:31', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '34', 'temp4', '培训时间', 4, 'datetime', 1, 200, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:30', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '34', 'temp3', '培训类型', 1, 'select', 1, 200, null, '', 'training_type', '1', null, '0', '0', 1, '2020-07-22 00:42:12', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '34', 'temp2', '培训主题', 3, 'text', 2, 20, null, '', '', '1', null, '0', '0', 1, '2020-07-20 22:34:28', null, null, null);
+INSERT INTO wm_task_content_config (base_type_id, task_type_id, task_filed_key, task_filed_value, seq, task_filed_type, task_filed_minsize, task_filed_maxsize, task_filed_alert, dict_url, dict_group_name, is_mustfill, dept_id, del_flag, enable_flag, tenant_id, create_time, create_user, update_time, update_user) VALUES ('1', '34', 'temp32', '关联积分包', 2, 'domain', 1, 200, null, null, 'package_list', '1', null, '0', '0', 1, '2021-01-17 10:54:59', null, null, null);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskContentServiceImpl.java

@@ -179,6 +179,31 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 				return R.failed(1, "30天以前的任务无法提交");
 			}
 			wmTaskContent.setTemp30(wmTaskContent.getTemp3());
+		} else if ("34".equals(wmTaskContent.getTemp30())) {
+			// 培训（医院患者教育培训 、药店药师培训 、商业公司培训）
+			// 限制每天两次
+			LocalDate currentLookintoDate =
+					LocalDate.parse(wmTaskContent.getTemp4(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+			LocalDateTime start = LocalDateTime.of(currentLookintoDate,LocalTime.MIN);
+			LocalDateTime end = LocalDateTime.of(currentLookintoDate,LocalTime.MAX);
+			long meetingTaskCount = wmTaskService.countMeetingTask(CollectionUtil.toList("19"),
+					String.valueOf(sysU.getUserId()), start, end);
+			log.info("培训次数：{}", meetingTaskCount);
+			if (meetingTaskCount >= 2L) {
+				return R.failed(1, "每天最多举办两场培训");
+			}
+
+			String date = wmTaskContent.getTemp4();
+			Date date1 = DateUtil.parse(date);
+			Date date2 = new Date();
+			if (date1.after(date2)) {
+				return R.failed(1, "培训时间不能选择之后的时间");
+			}
+			long betweenDay = DateUtil.between(date1, date2, DateUnit.DAY);
+			if (betweenDay >= 30L) {
+				return R.failed(1, "30天以前的任务无法提交");
+			}
+			wmTaskContent.setTemp30(wmTaskContent.getTemp3());
 		}
 
 		if ("21".equals(wmTaskContent.getTemp30()) || "12".equals(wmTaskContent.getTemp30())