Merge branch 'feat-20221115-logisticscollection'

db/v2.0/221116.sql

@@ -0,0 +1,23 @@
+-- 45-物流信息收集任务类型 字段配置
+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 ('45', '45', 'temp32', '关联积分包', 1, 'domain', 1, 200, '', '', 'package_list', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('45', '45', 'temp2', '配送客户名称  ', 2, 'text', 4, 50, '', '', '', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('45', '45', 'temp26', '配送物名称  ', 3, 'text', 4, 50, '', '', '', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('45', '45', 'temp3', '配送数量', 4, 'number', 2, 20, '', '', '', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('45', '45', 'temp4', '配送时间', 5, 'datetime', 1, 200, '', '', '', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('45', '45', 'temp5', '所属地区', 6, 'area', 1, 200, '', '', '', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('45', '45', 'temp31', '位置打卡', 7, 'map', 1, 200, '', '', '', '0', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('45', '45', 'temp6', '出库单/物流单（至少上传1张）', 8, 'img', 1, 5, '', '', '', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('45', '45', 'temp7', '现场照片（至少上传2张，需包含配送物、配送条件）', 9, 'img', 2, 5, '', '', '', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('45', '45', 'temp8', '签收单（至少上传1张）', 10, 'img', 1, 5, '', '', '', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('45', '45', 'temp10', '总结', 11, 'longtext', 5, 100, '', '', '', '0', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', null);
+
+-- 46-设备保养任务类型 字段配置
+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 ('46', '46', 'temp32', '关联积分包', 1, 'domain', 1, 200, '', '', 'package_list', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('46', '46', 'temp2', '设备名称', 2, 'text', 4, 50, '', '', '', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('46', '46', 'temp26', '保养科目', 3, 'text', 4, 50, '', '', '', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('46', '46', 'temp4', '保养时间', 5, 'datetime', 1, 200, '', '', '', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('46', '46', 'temp31', '位置打卡', 7, 'map', 1, 200, '', '', '', '0', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('46', '46', 'temp6', '消耗品（至少上传1张）', 8, 'img', 1, 5, '', '', '', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('46', '46', 'temp7', '现场照片（至少上传1张）', 9, 'img', 1, 5, '', '', '', '1', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('46', '46', 'temp8', '维修单（至少上传1张）', 10, 'img', 1, 5, '', '', '', '0', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', 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 ('46', '46', 'temp10', '工作总结', 11, 'longtext', 5, 100, '', '', '', '0', null, '0', '0', 1, '2022-11-15 09:49:30', null, '2022-11-15 09:49:30', null);

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

@@ -150,6 +150,8 @@ public class WmDeptTaskTypeConfigServiceImpl extends ServiceImpl<WmDeptTaskTypeC
 			add("手术跟台-一级");
 			add("手术跟台-二级");
 			add("手术跟台-三级");
+			add("物流信息收集");
+			add("设备保养");
 		}};
 		BASE_TASK_TYPE_MAP.put("专项服务", medicineList);