Merge remote-tracking branch 'origin/master'

src/main/java/com/hand/hls/hlcm/hlinteface/JycDemo.java

+package com.hand.hls.hlcm.hlinteface;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class JycDemo {
+    public static String doGet(String httpUrl){
+        //链接
+        System.setProperty("javax.net.ssl.keyStore", "D:/jks/hlltrust2.jks");
+        System.setProperty("javax.net.ssl.keyStorePassword", "123456");
+        System.setProperty("https.protocols", "TLSv1.2");
+        System.out.println("======>2222222");
+
+        HttpURLConnection connection = null;
+        InputStream is = null;
+        BufferedReader br = null;
+        StringBuffer result = new StringBuffer();
+        try {
+            //创建连接
+            URL url = new URL(httpUrl);
+            connection = (HttpURLConnection) url.openConnection();
+            //设置请求方式、
+            connection.setRequestMethod("GET");
+            //设置连接超时时间
+            connection.setReadTimeout(15000);
+            //开始连接
+            connection.connect();
+            //获取响应数据
+            if (connection.getResponseCode() == 200) {
+                //获取返回的数据
+                is = connection.getInputStream();
+                if (null != is) {
+                    br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+                    String temp = null;
+                    while (null != (temp = br.readLine())) {
+                        result.append(temp);
+                    }
+
+                }
+            }
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (null != br) {
+                try {
+                    br.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (null != is) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            //关闭远程连接
+            connection.disconnect();
+        }
+        return result.toString();
+    }
+
+    public static void main(String[] args) throws Exception{
+       String message = doGet("https://sys-dev.hongling.sh.cn/hlcm_dev_2023/wjflwar2/getEquStatus?equNo=SY036EBJ27118&type=wj&reqClientIp=39.97.244.233");
+        System.out.println(message);
+    }
+}

src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_agent_lov.lwm

@@ -10,6 +10,7 @@
         <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/>
         <bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/>
         <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/>
+        <bm:field name="extra_nam" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" physicalName="EXTRA_NAM" prompt="代理店简称"/>
         <bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="HLS_BP_MASTER_V.COMPANY_ID"/>
         <bm:field name="company_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_CODE" prompt="HLS_BP_MASTER_V.COMPANY_CODE"/>
         <bm:field name="company_short_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_SHORT_NAME" prompt="HLS_BP_MASTER_V.COMPANY_SHORT_NAME"/>

src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_agent_vender_lov.lwm

@@ -9,6 +9,7 @@
     <bm:fields>
         <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/>
         <bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/>
+        <bm:field name="extra_nam" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" physicalName="EXTRA_NAM" prompt="代理店简称"/>
         <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/>
         <bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="HLS_BP_MASTER_V.COMPANY_ID"/>
         <bm:field name="company_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_CODE" prompt="HLS_BP_MASTER_V.COMPANY_CODE"/>

src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm

@@ -12,6 +12,8 @@
 			             t1.bp_id_tenant,
 			             t1.bp_id_agent_level1,
 			             (select bp_name from hls_bp_master where bp_id = t1.bp_id_tenant) bp_name,
+			             (SELECT u.unit_name from exp_org_unit_v u,hls_bp_master h
+			              WHERE u.unit_id = h.unit_id and h.bp_id=t1.bp_id_tenant) agent_name,
 			             (SELECT sc.code_value_name
                             FROM sys_code_values_v sc
                             WHERE sc.code = 'CON500_CONTRACT_STATUS'
@@ -56,6 +58,7 @@ select t.parent_company_id company_id
         <bm:field name="division"/>
         <bm:field name="business_type_n"/>
         <bm:field name="search_term_1"/>
+        <bm:field name="agent_name"/>
     </bm:fields>
     <bm:query-fields>
         <bm:query-field field="contract_id" queryOperator="="/>

src/main/webapp/WEB-INF/classes/csh/CSH531N/contract_bp.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:s="leaf.plugin.script" xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+            select count(*) as con_sum from con_contract_bp ccb where ccb.bp_id=${@bp_id} and ccb.contract_id =${@contract_id} #WHERE_CLAUSE#
+            ]]></bm:query-sql>
+            <bm:parameters>
+                <bm:parameter name="con_sum" dataType="java.lang.Long" input="false" output="true" outputPath="@con_sum"/>
+            </bm:parameters>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/sys/SYS403/sys_zx_t2_sms_list.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+            begin
+                hls_payment_msm_send_pkg.sys_zx_t2_sms_loop(p_user_id =>${/session/@user_id}, p_batch_id =>${@batch_id});
+            end;
+            ]]></bm:update-sql>
+            <bm:parameters>
+                <bm:parameter name="batch_id" dataType="java.lang.Long" input="true" output="true"
+                              outputPath="/parameter/@batch_id"/>
+            </bm:parameters>
+        </bm:operation>
+    </bm:operations>
+
+</bm:model>

src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_g_result_queryfields.js

@@ -6,8 +6,13 @@
 	{
 		name : 'approval_date_to',
 		queryexpression : "trunc(t1.approval_date) <= to_date(${@approval_date_to},'yyyy-mm-dd')"
+	},
+	{
+		name : 'if_history',
+		queryexpression : "((${@if_history} ='N' and (t1.if_history = 'N' or t1.if_history is null)) or (${@if_history} ='Y' and (t1.if_history in ('N','Y') or t1.if_history is null)))"
 	}
 ];
 
 
+
 override();

src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_m_result_queryfields.js

@@ -6,6 +6,10 @@
 	{
 		name : 'approval_date_to',
 		queryexpression : "trunc(t1.approval_date) <= to_date(${@approval_date_to},'yyyy-mm-dd')"
+	},
+	{
+		name : 'if_history',
+		queryexpression : "((${@if_history} ='N' and (t1.if_history = 'N' or t1.if_history is null)) or (${@if_history} ='Y' and (t1.if_history in ('N','Y') or t1.if_history is null)))"
 	}
 ];
 

src/main/webapp/WEB-INF/server-script/layoutconfig/hsbc100_r_result_queryfields.js

@@ -14,8 +14,13 @@
 	{
 		name : 'collection_classes',
 		queryexpression : "collection_classes = ${@collection_classes}"
+	},
+	{
+		name : 'if_history',
+		queryexpression : "((${@if_history} ='N' and (t1.if_history = 'N' or t1.if_history is null)) or (${@if_history} ='Y' and (t1.if_history in ('N','Y') or t1.if_history is null)))"
 	}
 ];
 
 
+
 override();

src/main/webapp/modules/cont/CON7000/con_rent_trans_penalty_create_detail.lview

@@ -61,6 +61,11 @@
         }
 
         function con7000_submit() {
+            var gld_write_record = $('con7000_gld_write_off_ds').getAll();
+            if(Ext.isEmpty(gld_write_record)){
+                Leaf.showMessage('提示', '请先保存!');
+                return false;
+            }
             var hd_record = $('con_rent_trans_penalty_hd_ds').getAt(0);
             var gld_record = $('con7000_gld_write_off_ds').getAll();
             if (gld_record.length < 1) {

src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview

@@ -1189,6 +1189,10 @@
                         }
                     }
                 }
+                if(name== 'other_relationships' && value && record){
+                    record.set('identity_type',' ');
+                    record.set('identity_type_n',' ');
+                }
             }
 
 

src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview

@@ -1046,6 +1046,10 @@
                             }
                         }
                     }
+                    if(name== 'other_relationships' && value && record){
+                        record.set('identity_type',' ');
+                        record.set('identity_type_n',' ');
+                    }
                 }
 
                 //法人身份证号校验

src/main/webapp/modules/hls/HLS214N/hls_bp_master_req_modify.lview

@@ -1290,6 +1290,10 @@
                         }
                     }
                 }
+                if(name== 'other_relationships' && value && record){
+                    record.set('identity_type',' ');
+                    record.set('identity_type_n',' ');
+                }
             }
 
             var test_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC', 'hls_bp_master_req');

src/main/webapp/modules/sys/SYS403/sys_zx_t2_sms_list.lsc

+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:p="uncertain.proc"
+           xmlns:a="http://www.leaf-framework.org/application"
+           xmlns:s="leaf.plugin.script"
+           trace="true">
+
+    <a:init-procedure>
+        <s:server-script><![CDATA[
+            importPackage(Packages.java.util)
+            importPackage(Packages.com.hand.hls.hlcm.emay);
+            importPackage(Packages.com.hand.hap.system.dto)
+
+            //step2 发送短信
+            function sendsms() {
+                // 查询待发送短信表
+                var contract_collection = $bm('sys.SYS403.sys_zx_t2_sms_list');
+                contract_collection.update();
+
+            }
+            sendsms();
+        ]]></s:server-script>
+    </a:init-procedure>
+    <a:service-output output="/parameter"/>
+</a:service>
\ No newline at end of file