Browse Source

feat: 通过任务类型获取表单配置 增加 库存盘点-中药颗粒剂、应收账款回款的判断

lixuesong 2 years ago
parent
commit
00b7e14041

+ 14 - 0
db/v2.0/220830.sql

@@ -0,0 +1,14 @@
+-- 1.新增任务类型 库存盘点-中药颗粒剂 字段配置
+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 ('3', '37', 'temp32', '关联积分包', 1, 'domain', 1, 200, '', '', 'package_list', '1', null, '0', '0', 1, '2021-06-11 16:28:31', null, '2021-06-11 16:28:31', 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 ('3', '37', 'temp23', '调查类别', 2, 'select', 1, 2, '', '', 'market_survey_type', '1', null, '0', '0', 1, '2021-06-11 16:29:17', null, '2021-06-11 16:29:16', 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 ('3', '37', 'temp2', '标题', 3, 'text', 4, 50, '', '', '', '1', null, '0', '0', 1, '2021-06-11 16:30:46', null, '2021-06-11 16:30:45', 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 ('3', '37', 'temp26', '调查对象', 4, 'inputautoselect', 1, 500, '', '', 'ent_dclx1', '1', null, '0', '0', 1, '2021-06-11 16:31:59', null, '2021-06-11 16:31:58', 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 ('3', '37', 'temp4', '调研时间', 6, 'datetime', 1, 200, '', '', '', '1', null, '0', '0', 1, '2021-06-11 16:36:24', null, '2021-06-11 16:36:23', 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 ('3', '37', 'temp5', '所属地区', 7, 'area', 1, 200, '', '', '', '1', null, '0', '0', 1, '2021-06-11 16:37:18', null, '2021-06-11 16:37:18', 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 ('3', '37', 'temp31', '位置打卡', 8, 'map', 1, 200, '', '', '', '0', null, '0', '0', 1, '2021-06-11 16:38:14', null, '2021-06-11 16:38:13', 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 ('3', '37', 'temp6', '盘点表上传(请将库存调查表按示例全表拍摄上传)', 9, 'img', 1, 5, '', '', '', '1', null, '0', '0', 1, '2021-06-11 16:39:04', null, '2021-06-11 16:39:03', 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 ('3', '37', 'temp9', '监盘人签名', 10, 'img', 1, 5, '', '', '', '1', null, '0', '0', 1, '2021-06-28 16:54:40', null, '2021-06-28 16:54:39', 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 ('3', '37', 'temp10', '现场照片上传(请将库存信息屏幕/现场照片拍照上传)', 11, 'img', 1, 5, '', '', '', '1', null, '0', '0', 1, '2021-06-28 16:56:03', null, '2021-06-28 16:56:03', 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 ('3', '37', 'temp7', '调研总结', 12, 'longtext', 5, 100, '', '', '', '0', null, '0', '0', 1, '2021-06-11 16:39:59', null, '2021-06-11 16:39:58', null);
+
+-- 2.字典值新增task_filed_type = sign 签名

+ 7 - 3
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -235,13 +235,17 @@ public class ApiController {
 
 		Map<String, Object> connfigMap = new LinkedHashMap<>();
 
-		// 库存调查需要调查常规的和首次
-		if ("14".equals(taskTypeId) || "31".equals(taskTypeId)) {
+		// 库存调查需要调查常规的/首次的/库存盘点-中药颗粒剂
+		if ("14".equals(taskTypeId) || "31".equals(taskTypeId) || "37".equals(taskTypeId)) {
 			// 常规调查
 			connfigMap.put("14", getTaskContentConfigByTaskTypeId("14"));
 			// 首次调查
 			connfigMap.put("31", getTaskContentConfigByTaskTypeId("31"));
-
+			// 库存盘点-中药颗粒剂
+			connfigMap.put("37", getTaskContentConfigByTaskTypeId("37"));
+		} else if ("39".equals(taskTypeId) || "40".equals(taskTypeId) || "41".equals(taskTypeId)) {
+			// 应收账款回款-A类、应收账款回款-B类、应收账款回款-C类 都取39
+			connfigMap.put("39", getTaskContentConfigByTaskTypeId("39"));
 		} else {
 			connfigMap = getTaskContentConfigByTaskTypeId(taskTypeId);
 		}