正式环境地址配置，sql修改

dgtis-modules/dgtis-modules-data/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 dgtis:
   project-name: ShangHaiLife-ECIF
-  common-server-addr: 192.168.100.254
+  common-server-addr: 10.52.3.1
 # Tomcat
 server:
   port: 19204
@@ -8,9 +8,9 @@ server:
 elasticsearch:
   cluster:
     name: cluster
-  host: 10.32.2.230
+  host: 10.52.3.12
   port: 9200
-  hostlist: 10.32.2.230:9200,10.32.2.231:9200,10.32.2.232:9200,10.32.2.233:9200,10.32.2.234:9200
+  hostlist: 10.52.3.11:9200,10.52.3.12:9200,10.52.3.13:9200
   client:
     connectNum: 10
     connectPerRoute: 50

dgtis-ui/.env.production

@@ -2,4 +2,4 @@
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = http://10.52.200.159:8080/shanghaigateway/
+VUE_APP_BASE_API = http://10.52.3.1:9080/shanghaigateway/

dgtis-ui/src/views/system/userInfoList/index.vue

@@ -212,9 +212,6 @@
       console.log(that.$route.params)
       var newQueryParams = {...that.queryParams,...that.params};
 
-      if(newQueryParams.education){
-        newQueryParams.education = newQueryParams.education.join("&");
-      }
       console.log(newQueryParams)
         listCustomer(newQueryParams).then(response => {
             console.log(response);

sql-achievement/存储过程/人寿测试环境使用sql整理/参与方事件.sql

@@ -133,58 +133,18 @@ BEGIN
 		created_by ,
 		created_time 
 )select 
-	   		reflect("java.util.UUID", "randomUUID"),
-	   		e.contno,
-	   		max(i.customerno),
-	   		max(i.name),
-	   		'投保人' AS tbr,
-	   		'保全' AS bq,
-	   		e.edorappdate,
-	   		CASE max(e.edortype)
-			WHEN 'AE' THEN '投保人变更'
-			WHEN 'AM' THEN '客户联系方式变更'
-			WHEN 'AP' THEN '自垫选择权变更'
-			WHEN 'BB' THEN '客户基本资料变更'
-			WHEN 'BC' THEN '受益人及受益人资料变更'
-			WHEN 'BM' THEN '红利领取方式变更'
-			WHEN 'BS' THEN '签名变更'
-			WHEN 'CM' THEN '客户重要资料变更(客户层)'
-			WHEN 'CT' THEN '退保'
-			WHEN 'DB' THEN '红利领取'
-			WHEN 'EN' THEN '续保方式变更'
-			WHEN 'FM' THEN '交费期间变更'
-			WHEN 'GC' THEN '生存金转账领取授权申请/取消'
-			WHEN 'GM' THEN '领取方式变更'
-			WHEN 'GT' THEN '保险公司解除合同'
-			WHEN 'HI' THEN '补充告知'
-			WHEN 'IC' THEN '客户重要资料变更(保单层)'
-			WHEN 'IO' THEN '职业类别变更'
-			WHEN 'LG' THEN '生存给付'
-			WHEN 'LN' THEN '保单借款'
-			WHEN 'LR' THEN '保单补发'
-			WHEN 'NS' THEN '新增附加险'
-			WHEN 'OP' THEN '万能险部分领取'
-			WHEN 'PC' THEN '交费方式及交费账号变更'
-			WHEN 'PL' THEN '保单挂失与挂失解除'
-			WHEN 'PM' THEN '交费间隔变更'
-			WHEN 'PR' THEN '保单迁移'
-			WHEN 'PT' THEN '减保'
-			WHEN 'PU' THEN '减额交清'
-			WHEN 'RB' THEN '保全回退'
-			WHEN 'RE' THEN '保单复效'
-			WHEN 'RF' THEN '贷款清偿'
-			WHEN 'SC' THEN '特别约定变更'
-			WHEN 'TR' THEN '保费自垫清偿'
-			WHEN 'WT' THEN '犹豫期退保'
-			WHEN 'XS' THEN '协议减保'
-			WHEN 'XT' THEN '协议退保'
-			END AS edortype,
-	   		'admin',
-			sysdate()
-	   from dsj.edorinfo e
-	   LEFT JOIN dsj.policy_information i ON e.contno = i.contno
-	WHERE e.contno IS NOT NULL
-	GROUP BY e.contno,e.edorappdate;
+   		reflect("java.util.UUID", "randomUUID"),
+		i.contno,
+		i.customerno,
+		i.name,
+		'投保人' AS tbr,
+   		'保全' AS bq,
+		l.edorappdate,
+		lm.edorname,
+		'admin',
+		sysdate()
+FROM dsj.lpedoritem l,dsj.lmedoritem lm,dsj.policy_information i 
+WHERE l.edortype = lm.edorcode AND lm.appobj <> 'G' AND l.edorstate = '0' AND i.contno = l.contno
 	EXCEPTION
 			WHEN HIVE_EXCEPTION THEN 
 				 INSERT INTO shanglifeecif.exception_log(log_id,log_code,log_msg,log_time) VALUES (to_char(sysdate(),'yyyyMMddHHmmss'),sqlcode(),sqlerrm(),sysdate());
@@ -372,7 +332,7 @@ BEGIN
    		 '',
    		'投保人',
    		'续期',
-   		to_char(lp.paydate,'yyyy-MM-dd'),
+   		to_char(lp.confdate,'yyyy-MM-dd'),
    		'admin',
    		sysdate
 	FROM dsj.ljapayperson lp WHERE lp.paycount > 1;
@@ -392,5 +352,9 @@ BEGIN
 	shanglifeecif.partytimeline_lp();
 	shanglifeecif.partytimeline_zx();
 	shanglifeecif.partytimeline_bq();
+	shanglifeecif.partytimeline_tuibao();
+	shanglifeecif.partytimeline_ts();
+	shanglifeecif.partytimeline_hf();
+	shanglifeecif.partytimeline_xq();
 END;
 

sql-achievement/存储过程/人寿测试环境使用sql整理/客户信息.sql

@@ -373,7 +373,7 @@ BEGIN
 			Nation, --国籍
 			MaritalStat, --婚姻
 			Employer,--工作单位
-			Education,--学历
+			--Education,--学历
 			Dday, --死亡日期
 			regtype,  --户籍类型
 			ZIPCODE,--邮编
@@ -402,7 +402,7 @@ BEGIN
 					trim(b.NATIVEPLACE) as NATIVEPLACE, --国籍
 					trim(b.MARRIAGE) as MARRIAGE,--婚姻
 					trim(b.GRPNAME) as GRPNAME,--工作单位名称
-					trim(b.DEGREE) as DEGREE,--学历
+					--trim(b.DEGREE) as DEGREE,--学历
 					trim(b.DEATHDATE) as DEATHDATE,--死亡日期
 					trim(b.DENTYPE) as DENTYPE,--户籍类型
 					trim(b.ZIPCODE) as ZIPCODE,--邮编
@@ -411,14 +411,15 @@ BEGIN
 					trim(b.EMAIL) as EMAIL,--邮箱
 					regexp_replace(trim(b.POSTALADDRESS),'[0-9]','*') as POSTALADDRESS, --联系地址
 					regexp_extract(b.POSTALADDRESS,'(.*?)省|(.*?)市',0) -- 省份
-				from t_customer_class b
+				from dsj.t_customer_class b
 				where b.CUSTOMER_ID = a.scustid
 		) WHERE 1=1 ;
 		EXCEPTION
 			WHEN HIVE_EXCEPTION THEN 
-				 INSERT INTO shanglifeecif.exception_log(log_code,log_msg,log_time) VALUES (sqlcode(),sqlerrm(),sysdate());
+				 INSERT INTO shanglifeecif.exception_log(log_id,log_code,log_msg,log_time) VALUES (to_char(sysdate(),'yyyyMMddHHmmss'),sqlcode(),sqlerrm(),sysdate());
 			WHEN Others THEN
-				INSERT INTO shanglifeecif.exception_log(log_code,log_msg,log_time) VALUES (sqlcode(),sqlerrm(),sysdate());	
+				INSERT INTO shanglifeecif.exception_log(log_id,log_code,log_msg,log_time) VALUES (to_char(sysdate(),'yyyyMMddHHmmss'),sqlcode(),sqlerrm(),sysdate());	
+
 END;
 /
 CREATE OR REPLACE PROCEDURE shanglifeecif.up_other_customerinfo() -- 创建存储过程

sql-achievement/存储过程/人寿测试环境使用sql整理/客户标签20210409预生产.sql

@@ -125,7 +125,7 @@ BEGIN
 		
 	
 	--23	是否贷款	label26	筛选客户为投保人的有效保单，且办理了贷款业务	有贷款	
-	UPDATE shanglifeecif.Individual si1 SET si1.label26 = '有贷款' WHERE si1.scustid IN (
+	UPDATE shanglifeecif.Individual si1 SET si1.label26 = '有保单贷款' WHERE si1.scustid IN (
 		SELECT p.customerno FROM dsj.policy_information p WHERE p.appflag = '有效' and p.contno IN (
 			SELECT contno FROM dsj.loloandetail WHERE moneytype='DK'
 		) 
@@ -421,19 +421,19 @@ BEGIN
 	--	最近一次保全类型	label55	客户最后一次办理保全业务的业务类型	
 
 	UPDATE shanglifeecif.Individual si1 SET si1.label55 = (
-		SELECT t.edorname FROM (
+		SELECT '客户最近一次办理'||t.edorname FROM (
 			SELECT
-				row_number() over(partition by l.insuredno ORDER BY l.edorAPPDATE DESC) rn,
+				row_number() over(partition by p.customerno ORDER BY l.edorAPPDATE DESC,l.uwtime DESC) rn,
 				l.edortype,
 				l.contno,
-				l.insuredno,
+				p.customerno,
 				l.edorappdate,
 				l.edorstate,
 				lm.edorcode,
 				lm.edorname 
-				FROM dsj.lpedoritem l,dsj.lmedoritem lm 
-				WHERE l.edortype = lm.edorcode AND lm.appobj <> 'G' AND l.edorstate = '0'
-			) t WHERE t.rn = 1 AND si1.scustid = t.insuredno
+				FROM dsj.lpedoritem l,dsj.lmedoritem lm,dsj.policy_information p 
+				WHERE l.edortype = lm.edorcode AND lm.appobj <> 'G' AND l.edorstate = '0' AND p.contno = l.contno
+			) t WHERE t.rn = 1 AND si1.scustid = t.customerno
 	) WHERE 1 = 1;
 	
 	
@@ -613,7 +613,7 @@ BEGIN
 	
 	--失效原因
 	UPDATE shanglifeecif.Individual si1 SET si1.label92 = (
-	SELECT t.terminatestate FROM (
+	SELECT '有'||t.terminatestate||'保单' FROM (
 		SELECT row_number()over(partition by p.customerno order by p.polapplydate desc) rn,p.customerno,p.terminatestate FROM dsj.policy_information p 
 		WHERE p.appflag = '失效'
 	) t WHERE t.rn = 1 AND si1.scustid = t.customerno
@@ -627,30 +627,58 @@ BEGIN
 	--) temp WHERE temp.tnum = temp.pnum);
 	--终止原因
 	UPDATE shanglifeecif.Individual si1 SET si1.Label94 = (
-	SELECT t.terminatestate FROM (
+	SELECT '有'||t.terminatestate||'保单' FROM (
 		SELECT row_number()over(partition by p.customerno order by p.polapplydate desc) rn,p.customerno,p.terminatestate FROM dsj.policy_information p 
 		WHERE p.appflag = '终止'
 	) t WHERE t.rn = 1 AND si1.scustid = t.customerno
 );
 	--81	上年续期交费情况	label95	相对于上一年的交费日期和实收日期，提前X天交费、滞后X天交费、宽限期外交费、失效客户	提前X天交费、滞后X天交费、宽限期外交费	
-	UPDATE shanglifeecif.Individual si1 SET si1.Label95 = (
-	SELECT 
-	CASE 
+	--UPDATE shanglifeecif.Individual si1 SET si1.Label95 = (
+	--SELECT 
+	--CASE 
 		
-		WHEN temp.dnum<0 THEN '提前'||abs(temp.dnum)||'天交费'
-		WHEN temp.dnum>0 THEN '滞后'||temp.dnum||'天交费'
-		WHEN temp.toconfdate > temp.kxdate THEN '宽限期外交费'
-	END	
-		FROM (
-			SELECT row_number()over(PARTITION BY t.appntno ORDER BY t.confdate DESC) rn,t.appntno,t.paydate as topaydate,t.confdate as toconfdate,DATE_ADD(t.paydate,60) as kxdate,tt.paydate as lastpaydate,tt.confdate AS lastconfdate,DATEDIFF(to_char(t.confdate,'0000-MM-dd'),to_char(tt.confdate,'0000-MM-dd')) AS dnum FROM (
-			SELECT row_number()OVER(PARTITION BY ln.contno ORDER BY ln.paydate DESC) rd,ln.* FROM dsj.ljapayperson ln 
-			WHERE ln.confdate IS NOT NULL AND ln.paydate IS NOT null
-		) t LEFT JOIN (
-			SELECT row_number()OVER(PARTITION BY ln2.contno ORDER BY ln2.paydate DESC) rd,ln2.* FROM dsj.ljapayperson ln2
-			WHERE ln2.confdate IS NOT NULL AND ln2.paydate IS NOT null AND ln2.paycount > 1
-		) tt ON t.contno = tt.contno AND t.rd = tt.rd - 1 WHERE t.rd = 1 AND tt.rd = 2 
-		) temp WHERE temp.dnum <> 0 AND temp.rn = 1 AND si1.scustid = temp.appntno
-) WHERE 1 = 1;
+	--	WHEN temp.dnum<0 THEN '上一年提前'||abs(temp.dnum)||'天交费'
+	--	WHEN temp.dnum>0 THEN '上一年滞后'||temp.dnum||'天交费'
+	--	WHEN temp.toconfdate > temp.kxdate THEN '上一年宽限期外交费'
+	--END	
+	--	FROM (
+	--		SELECT row_number()over(PARTITION BY t.appntno ORDER BY t.confdate DESC) rn,t.appntno,t.paydate as topaydate,t.confdate as toconfdate,DATE_ADD(t.paydate,60) as --kxdate,tt.paydate as lastpaydate,tt.confdate AS lastconfdate,DATEDIFF(to_char(t.confdate,'0000-MM-dd'),to_char(tt.confdate,'0000-MM-dd')) AS dnum FROM (
+	--		SELECT row_number()OVER(PARTITION BY ln.contno ORDER BY ln.paydate DESC) rd,ln.* FROM dsj.ljapayperson ln 
+	--		WHERE ln.confdate IS NOT NULL AND ln.paydate IS NOT null
+	--	) t LEFT JOIN (
+	--		SELECT row_number()OVER(PARTITION BY ln2.contno ORDER BY ln2.paydate DESC) rd,ln2.* FROM dsj.ljapayperson ln2
+	--		WHERE ln2.confdate IS NOT NULL AND ln2.paydate IS NOT null AND ln2.paycount > 1
+	--	) tt ON t.contno = tt.contno AND t.rd = tt.rd - 1 WHERE t.rd = 1 AND tt.rd = 2 
+	--	) temp WHERE temp.dnum <> 0 AND temp.rn = 1 AND si1.scustid = temp.appntno
+--) WHERE 1 = 1;
+	--UPDATE shanglifeecif.Individual si1 SET si1.Label95 = (
+	--	SELECT
+	--		CASE 
+	--		WHEN t.dnum<0 THEN '提前'||abs(t.dnum)||'天交费'
+	--		WHEN t.dnum>0 AND t.dnum<=60 THEN '滞后'||t.dnum||'天交费'
+	--		WHEN t.dnum>60 THEN '宽限期外交费'
+	--		END
+	--	FROM (
+	--		SELECT row_number()over(PARTITION BY p.customerno ORDER BY p.confdate DESC) rn,p.customerno,DATEDIFF(to_char(p.confdate,'0000-MM-dd'),to_char(p.polapplydate,'0000-MM-dd')) AS dnum FROM dsj.policy_information p 
+	--		WHERE p.appflag = '有效' AND p.payintv = '期缴'
+	--	) t WHERE t.dnum <> 0 AND t.rn = 1 AND si1.scustid = t.customerno
+	--) WHERE 1 = 1;
+	
+	UPDATE shanglifeecif.Individual si1 SET si1.Label95 = (
+	SELECT  
+		CASE 
+			WHEN t.dnum=0 THEN '上一年如期缴费'
+			WHEN t.dnum<0 THEN '上一年提前'||abs(t.dnum)||'天交费'
+			WHEN t.dnum>0 AND t.dnum<=60 THEN '上一年滞后'||t.dnum||'天交费'
+			WHEN t.dnum>60 THEN '上一年宽限期外交费'
+		END
+	FROM (
+		SELECT 
+		row_number()over(PARTITION BY l.appntno ORDER BY l.confdate DESC) rn,l.appntno,DATEDIFF(to_char(l.confdate,'0000-MM-dd'),to_char(l.curpaytodate,'0000-MM-dd')) AS dnum 
+		FROM dsj.ljapayperson l WHERE l.paycount > 1 AND YEAR(l.confdate) = YEAR(sysdate) - 1
+	) t WHERE  t.rn = 1 AND t.appntno = si1.scustid
+	) WHERE 1 = 1;
+	
 	
 	--98	大龄	Label96	大龄 来电客户年龄50岁以上
 	UPDATE shanglifeecif.Individual si1 SET si1.Label96 = '大龄'  where si1.scustid IN (
@@ -809,9 +837,10 @@ BEGIN
 	);
 	
 	--最近保全完成	label111	最近15天做过保全，来电日期-保全申请日期<15天	最近保全完成	
-
 	UPDATE shanglifeecif.Individual si1 SET si1.Label111 = '最近保全完成' WHERE si1.scustid IN (
-		SELECT l.insuredno FROM dsj.lpedoritem l WHERE DATEDIFF(to_char(SYSDATE,'yyyy-MM-dd HH:mm:ss.S'),l.edorappdate) < 15 AND l.edorstate = '0'
+		SELECT p.customerno FROM dsj.policy_information p WHERE p.contno IN (
+			SELECT l.contno FROM dsj.lpedoritem l WHERE DATEDIFF(to_char(SYSDATE,'yyyy-MM-dd HH:mm:ss.S'),l.edorappdate) < 15 AND l.edorstate = '0'
+		)
 	);
 	--115	生存金未领	Label113	生存金未领	判断逻辑不详	生存金领取方式为自动转账、存在生存金且未领取
 	UPDATE shanglifeecif.Individual si1 SET si1.label113 = '生存金未领' WHERE si1.scustid IN (