diff --git a/lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCCustomerImpartSchema.java b/lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCCustomerImpartSchema.java index 79f069a9..3f795d55 100644 --- a/lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCCustomerImpartSchema.java +++ b/lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCCustomerImpartSchema.java @@ -187,8 +187,16 @@ public class LCCustomerImpartSchema extends Entity implements Schema, @Column(index = 169, name = "ModifyOperator", desc = "最后一次修改操作员", type = Schema.TYPE_STRING) private String modifyOperator; + @Getter + @Setter + @Column(index = 170, name = "grpType", desc = "组织类型", type = Schema.TYPE_STRING) + private String grpType; + + @Getter + @Setter + @Column(index = 171, name = "cDate", desc = "成立日期", type = Schema.TYPE_DATE) + private Date cDate; + + @Getter + @Setter + @Column(index = 172, name = "bussarea", desc = "经营区域", type = Schema.TYPE_STRING) + private String bussarea; + + @Getter + @Setter + @Column(index = 173, name = "Corporation1", desc = "法人姓名", type = Schema.TYPE_STRING) + private String Corporation1; + + @Getter + @Setter + @Column(index = 174, name = "CorIDType1", desc = "法人证件类型", type = Schema.TYPE_STRING) + private String CorIDType1; + + @Getter + @Setter + @Column(index = 175, name = "CorID1", desc = "法人证件号码", type = Schema.TYPE_STRING) + private String CorID1; + + @Getter + @Setter + @Column(index = 176, name = "CorIDStartDate1", desc = "法人证件有效期起", type = Schema.TYPE_DATE) + private Date CorIDStartDate1; + + @Getter + @Setter + @Column(index = 177, name = "CorIDExpiryDate1", desc = "法人证件有效期止", type = Schema.TYPE_DATE) + private Date CorIDExpiryDate1; + - public static final int FIELDNUM = 170; // 数据库表的字段个数 + public static final int FIELDNUM = 178; // 数据库表的字段个数 private transient FDate fDate = new FDate(); // 处理日期 @@ -1806,6 +1846,73 @@ public class LCGrpContSchema extends Entity implements Schema, return this; } + + public String getCorIDStartDate1() { + if (CorIDStartDate1 != null) + return fDate.getString(CorIDStartDate1); + else + return null; + } + + public LCGrpContSchema setCorIDStartDate1(Date acDate) { + CorIDStartDate1 = acDate; + return this; + } + + public LCGrpContSchema setCorIDStartDate1(String acDate) { + if (acDate != null && !acDate.equals("") && !acDate.equals("null")) { + CorIDStartDate1 = fDate.getDate(acDate); + } else { + CorIDStartDate1 = null; + } + return this; + } + + public String getCDate() { + if (cDate != null) + return fDate.getString(cDate); + else + return null; + } + + public LCGrpContSchema setCDate(Date acDate) { + cDate = acDate; + return this; + } + + public LCGrpContSchema setCDate(String acDate) { + if (acDate != null && !acDate.equals("") && !acDate.equals("null")) { + cDate = fDate.getDate(acDate); + } else { + cDate = null; + } + return this; + } + + + public String getCorIDExpiryDate1() { + if (CorIDExpiryDate1 != null) + return fDate.getString(CorIDExpiryDate1); + else + return null; + } + + public LCGrpContSchema setCorIDExpiryDate1(Date acDate) { + CorIDExpiryDate1 = acDate; + return this; + } + + public LCGrpContSchema setCorIDExpiryDate1(String acDate) { + if (acDate != null && !acDate.equals("") && !acDate.equals("null")) { + CorIDExpiryDate1 = fDate.getDate(acDate); + } else { + CorIDExpiryDate1 = null; + } + return this; + } + + + public LCGrpContSchema setAmntShareRate(double aAmntShareRate) { amntShareRate = aAmntShareRate; return this; diff --git a/lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCGrpContactInfoSchema.java b/lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCGrpContactInfoSchema.java index 5c60a067..4adae989 100644 --- a/lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCGrpContactInfoSchema.java +++ b/lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCGrpContactInfoSchema.java @@ -136,8 +136,29 @@ public class LCGrpContactInfoSchema extends Entity implements Schema list,String operator) { + + if (!getInputData(operator)) { + return false; + } + + if (!checkData(list)) { + return false; + } + + if (!dealData(list)) { + return false; + } + + return saveData(); + } + + private boolean saveData() { + PubSubmit tPubSubmit = new PubSubmit(); + + mInputData.add(mMMap); + if (!tPubSubmit.submitData(mInputData, Action.INSERT_ACTION)) { + buildError("saveData", new I18nMessage("提交数据失败！", "LIS-08006")); + return false; + } + return true; + } + + private boolean dealData(List list) { + LCCustomerImpartSchema lcCustomerImpartSchema = list.get(0); + grpContNo = lcCustomerImpartSchema.getGrpContNo(); + + if (Action.INSERT_ACTION.equals(mOperate)) { + SQLwithBindVariables sqLwithBindVariables = lCCustomerImpartSQL.deleteByGrpContNo(grpContNo); + mMMap.put(sqLwithBindVariables, MMap.Action.DELETE); + + for (LCCustomerImpartSchema tLCCustomerImpartSchema : list) { + tLCCustomerImpartSchema.setModifyDate(mCurrentDate); + tLCCustomerImpartSchema.setMakeTime(mCurrentTime); + tLCCustomerImpartSchema.setModifyDate(mCurrentDate); + tLCCustomerImpartSchema.setMakeTime(mCurrentTime); + mMMap.put(tLCCustomerImpartSchema, MMap.Action.INSERT); + } + } + return true; + } + + private boolean checkData(List list) { + + for (LCCustomerImpartSchema tLCCustomerImpartSchema : list) { + String impartCode = tLCCustomerImpartSchema.getImpartCode(); + + String impartParamModle = tLCCustomerImpartSchema.getImpartParamModle(); + + if (StringUtils.isNotBlank(impartParamModle) && Objects.equals(impartCode, "A0101")){ + + String regex = "^\\d+(/\\d+){4}$"; + Pattern pattern = Pattern.compile(regex); + + if (!pattern.matcher(impartParamModle).matches()){ + buildError("checkData",new I18nMessage(impartCode+"参数错误，格式为：参数1/参数2/参数3/参数4/参数5", "LIS-72097")); + return false; + } + } + + if (StringUtils.isNotBlank(impartParamModle) && Objects.equals(impartCode, "A01010")){ + + String regex = "^\\d+(/\\d+)$"; + Pattern pattern = Pattern.compile(regex); + + if (!pattern.matcher(impartParamModle).matches()){ + buildError("checkData",new I18nMessage(impartCode+"参数错误，格式为：参数1/参数2", "LIS-72098")); + return false; + } + } + + + if (StringUtils.isNotBlank(impartParamModle) && !Objects.equals(impartCode, "A01010") && !Objects.equals(impartCode, "A0101")) { + if (!Objects.equals(impartParamModle, "是") && !Objects.equals(impartParamModle, "否") ){ + buildError("checkData",new I18nMessage(impartCode+"参数错误，请填是或否", "LIS-72099")); + return false; + } + } + } + + + + return true; + } + + private boolean getInputData(String operator) { + this.mOperate = operator; + return true; + } + + public CErrors getErrors() { + return mErrors; + } + + /** + * 错误构造方法 + * @param tFunctionName + * @param tErrorMessage + */ + private void buildError(String tFunctionName, I18nMessage tErrorMessage) { + + CError tCError = new CError(); + tCError.moduleName = this.getClass().getSimpleName(); + tCError.functionName = tFunctionName; + tCError.errorMessage(tErrorMessage); + mErrors.addOneError(tCError); + } + } diff --git a/lis-module-easyscan-common-service/src/main/java/com/sinosoft/lis/pubfun/LisImageShow.java b/lis-module-easyscan-common-service/src/main/java/com/sinosoft/lis/pubfun/LisImageShow.java index f868ba63..2d2ba076 100644 --- a/lis-module-easyscan-common-service/src/main/java/com/sinosoft/lis/pubfun/LisImageShow.java +++ b/lis-module-easyscan-common-service/src/main/java/com/sinosoft/lis/pubfun/LisImageShow.java @@ -115,7 +115,7 @@ public class LisImageShow { CallHTTP callHTTP = new CallHTTP(tES_DOC_PAGESSchema.getPageID(),tES_DOC_PAGESSchema.getHostName()); logger.info("pagePath="+pagePath); logger.info("fileName="+pageName + pageSuffix); - InputStream targetObject = callHTTP.getObject("/"+pagePath, pageName + pageSuffix); + InputStream targetObject = callHTTP.getObject(pagePath, pageName + pageSuffix); if (targetObject != null) { return targetObject; diff --git a/lis-module-grp-common-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCContSql.java b/lis-module-grp-common-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCContSql.java index e3b52b77..851958e8 100644 --- a/lis-module-grp-common-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCContSql.java +++ b/lis-module-grp-common-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCContSql.java @@ -148,12 +148,18 @@ public interface LCContSql { " OtherIdType," + " OtherIdNo, " + " b.AppntNo " + + ",b.grptype,(select codename from ldcode where codetype='grptype' and code= b.grptype)," + + " b.cdate,b.bussarea," + + " (select codename from ldcode where codetype='bussarea' and code= b.bussarea)," + + " b.corporation1,b.coridtype1," + + " (select codename from ldcode where codetype='idtype' and code= b.coridtype1)," + + " b.corid1,b.coridstartdate1,b.coridexpirydate1"+ " from lcgrpappnt a ,lcgrpcont b where a.GrpContNo =b.GrpContNo @{0}", clauses = { @Clause(key = 0, clause = "and a.grpcontno = '#{para0}'", expression = "#{para0} != empty")}) SSRS LCContSql4(@Param("para0") String para0); //#省市县查询 - @SQL(value = "select a.grpcontno,a.province,(select placename from ldaddress where placetype='01' and placecode=a.province),a.city,(select placename from ldaddress where placetype='02' and placecode=a.city),a.county,(select placename from ldaddress where placetype='03' and placecode=a.county),a.address,a.zipcode from LCGrpContactInfo a where 1=1 @{0}", clauses = { + @SQL(value = "select a.grpcontno,a.province,(select placename from ldaddress where placetype='01' and placecode=a.province),a.city,(select placename from ldaddress where placetype='02' and placecode=a.city),a.county,(select placename from ldaddress where placetype='03' and placecode=a.county),a.address,a.zipcode,a.linkprovincecode,(select placename from ldaddress where placetype='01' and placecode=a.linkprovincecode), a.linkcitycode,(select placename from ldaddress where placetype='02' and placecode=a.linkcitycode),a.linkcountycode,(select placename from ldaddress where placetype='03' and placecode=a.linkcountycode),a.linkdetailaddr\n from LCGrpContactInfo a where 1=1 @{0}", clauses = { @Clause(key = 0, clause = "and a.GrpContNo = '#{para0}'", expression = "#{para0} != empty")}) SSRS LCContSql5(@Param("para0") String para0); @@ -379,7 +385,7 @@ public interface LCContSql { SSRS LCContSql44(@Param("para0") String para0); //#计价方式查询 - @SQL(value = "select a.TaxpaperFlag,(select m.codename from ldcode m where m.codetype='invoicetypeflag' and m.code=a.TaxpaperFlag ),a.TaxpayerName,a.TaxpayerNo,a.BankName,a.BankAccNo,a.Phone,a.Address,a.IsElecInvoicePrint,(select CodeName from ldcode where CodeType ='iselecinvoiceprint' and Code = a.IsElecInvoicePrint),a.ElectInvoiceEmail from LCGrpInvoiceDetail a where 1=1 @{0}", clauses = { + @SQL(value = "select a.TaxpaperFlag,(select m.codename from ldcode m where m.codetype='invoicetypeflag' and m.code=a.TaxpaperFlag ),a.TaxpayerName,a.TaxpayerNo,a.BankName,a.BankAccNo,a.Phone,a.Address,a.IsElecInvoicePrint,(select CodeName from ldcode where CodeType ='iselecinvoiceprint' and Code = a.IsElecInvoicePrint),a.ElectInvoiceEmail,a.fuli,(select codename from ldcode where codetype='trueflag' and code=a.fuli),a.taxpayer,(select codename from ldcode where codetype='taxpayer' and code=a.taxpayer),a.invoice,(select codename from ldcode where codetype='invoice' and code=a.invoice) from LCGrpInvoiceDetail a where 1=1 @{0}", clauses = { @Clause(key = 0, clause = "and a.GrpContNo = '#{para0}'", expression = "#{para0} != empty")}) SSRS LCContSql45(@Param("para0") String para0); @SQL(value = "select 1 from lccontplan a where 1=1 @{0}", clauses = { diff --git a/lis-module-grp-common-web/src/main/webapp/g_busicommon/LDHealthAttachmentInput.jsp b/lis-module-grp-common-web/src/main/webapp/g_busicommon/LDHealthAttachmentInput.jsp new file mode 100644 index 00000000..32f3d435 --- /dev/null +++ b/lis-module-grp-common-web/src/main/webapp/g_busicommon/LDHealthAttachmentInput.jsp @@ -0,0 +1,322 @@ +<% + /*************************************************************** + *

ProName：LDHealthAttachmentInput.jsp

+ *

Title：附件管理

+ *

Description：附件管理

+ *

Copyright：Copyright (c) 2012

+ *

Company：Sinosoft

+ * @author : zhoufz + * @version : 8.0 + * @date : 2014-03-20 + ****************************************************************/ +%> +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> +<%@include file="../common/jsp/UsrCheck.jsp" %> +<%@page import="com.sinosoft.utility.XssUtil" %> +<% + String tOtherNoType = XssUtil.escapeJavaScript(request.getParameter("OtherNoType")); + String tOtherNo = XssUtil.escapeJavaScript(request.getParameter("OtherNo")); + String tSubOtherNo = XssUtil.escapeJavaScript(request.getParameter("SubOtherNo")); + String tUploadNode = XssUtil.escapeJavaScript(request.getParameter("UploadNode")); + + String[] t告知内容 = { + "1、投保单位过去三年有发生过死亡或伤残情况?是否向保险公司索赔过医疗保险金?若“是”请告知。＿年 疾病身故人数＿ 意外身故人数＿ 残疾人数＿ 医疗发生金额＿元", + "2、投保单位未在工作现场为参保人员提供《中华人民共和国劳动法》、《中华人民共和国安全生产法》、《中华人民共和国建筑法》等法律法规要求的安全技术、安全防护措施和其他维护安全、防范危险、预防火灾等措施?", + "3、参加投保的被保险人,近一年是否存在因患病或其他健康原因而不能工作连续达10个工作日或减轻劳动量的情况？", + "4、参加投保的被保险人，现在或过去是否存在患重大疾病或住院连续超过10天、或病假连续超过10天的情况？重大疾病内容如下：\n" + + "a、心脏病(心功能不全Ⅱ级及Ⅱ级以上)。\n" + + "b、高血压(Ⅱ级及Ⅱ级以上)、冠心病、心肌梗塞、心脏瓣膜病。\n" + + "c、脑血管疾病(脑出血、脑梗塞)、脑部的良性肿瘤、癫痫病、瘫痪、帕金森氏症。\n" + + "d、慢性肾脏疾病(肾小球肾炎、肾盂肾炎、肾病综合征、肾功能不全)。\n" + + "e、慢性阻塞性肺病(慢性支气管炎、肺气肿、肺心病)。\n" + + "f、慢性活动性肝炎、慢性病毒性肝炎、肝硬化。\n" + + "g、白血病、再生障碍性贫血、淋巴瘤、系统性红斑狼疮、糖尿病。\n" + + "h、任何恶性肿瘤、任何性质不明的肿块/阴影/结节。\n" + + "i、任何精神疾病、任何先天性或遗传性疾病、传染性疾病、性病或艾滋病。", + "5、参加投保的被保险人，是否需要参加飞行、潜水、登山、攀岩、赛车、赛马、举重、武术比赛、滑雪、滑浪、漂流、蹦极等危险活动？", + "6、参加投保的被保险人的职业是否涉及或接触任何危险物（化学物质、爆炸物、有毒物质、放射性物品或其他危险物）、高处作业（指在距坠落高度基准面 2 米或 2 米以上有可能坠落的高处进行的作业）、高压作业、潜水或水下作业、隧道坑道或井下作业等危险工作？", + "7、参加投保的被保险人，是否因工作原因需要前往正在或经常发生自然灾害、病疫、战乱、动乱、种族冲突、政局动荡的危险地区或国家？", + "8、参加投保的被保险人，是否存在以下一项或多项：\n" + "(1)非投保单位员工或非团体成员的人员(连带被保险人除外)?(2)计划长期居住或逗留在中国大陆以外的国家或地区累计超过6个月的人员? (3)残障、职业病人员?", + "9、投保时是否有正在怀孕的员工？", + "10、投保身故责任的未成年人是否有其他生效中的身故责任保险?若“是”请告知。\n" + + "富泽人寿＿万元；其他保险公司＿万元。" + }; +%> + + + + <%--附件管理--%>LIS + + + + + + + + + + + + + <%@include file="./LDAttachmentInit.jsp" %> + + + + + + + +
+
+ <%-- --%> + <%-- --%> + <%-- --%> + <%-- --%> + <%--
--%> + + <%--
--%> +
+
+
+
+ + <%-- --%> + <%-- --%> + <%-- --%> + <%-- --%> + + + <%-- --%> + + + + + + + + + + +
附件类型 + <%-- ondblclick="return showCodeList('attachtype',[this, AttachTypeName],[0, 1],null,null,null,'1',180);" --%> + <%-- onkeyup="return showCodeListKey('attachtype',[this, AttachTypeName],[0, 1],null,null,null,'1',180);">--%> + <%--
附件路径（仅支持txt，doc，docx，xls，xlsx，pdf，zip，eml 格式的文件上载，文件大小不超过5M）（仅支持txt，doc，docx，xls，xlsx，pdf，zip，eml 格式的文件上载，询价要求文件大小不超过10M） +
+ + + + + + +
+



+
+ + + + +
+ + + + + + +
+ 健康告知录入 (说明：1、建工险仅需填写第1-2项；2、第3-10项若为“是”,请在“详细描述”栏写明。) +
+ +
+ + +
+ +
+
+ + + + + + + + + + + + + +
序号
告知版别
告知编码
告知内容
填写内容
详细说明
+
+
+ + +
+ + + + + <% for(int i=1; i<=10; i++) { %> + + + + + + + + + + + + + + + + + + + + <% } %> + +
+
+ +
+ 		+
+ +
+ 		+
+ +
+ 		+
+ +
+ 		+
+ +
+ 		+
+ +
+
+
+
+ +
+
+ + +
+ +
+ + + + + + + + + + diff --git a/lis-module-grp-common-web/src/main/webapp/g_busicommon/LDHealthAttachmentMain.jsp b/lis-module-grp-common-web/src/main/webapp/g_busicommon/LDHealthAttachmentMain.jsp new file mode 100644 index 00000000..56a965f6 --- /dev/null +++ b/lis-module-grp-common-web/src/main/webapp/g_busicommon/LDHealthAttachmentMain.jsp @@ -0,0 +1,62 @@ +<% + /*************************************************************** + *

ProName：LDHealthAttachmentMain.jsp

+ *

Title：附件管理

+ *

Description：附件管理

+ *

Copyright：Copyright (c) 2012

+ *

Company：Sinosoft

+ * @author : zhoufz + * @version : 8.0 + * @date : 2014-03-20 + ****************************************************************/ +%> +<%@page pageEncoding="UTF-8" contentType="text/html;charset=UTF-8" %> +<%@include file="../common/jsp/UsrCheck.jsp"%> +<%@page import="com.sinosoft.utility.XssUtil"%> + + + <%--附件管理--%>LIS + + + + + + + + <%--标题与状态区域--%> + <%--保存客户端变量的区域，该区域必须有--%> + + + <%--保存客户端变量和WebServer实现交户的区域，该区域必须有--%> + + + + + + <%--菜单区域--%> + + <% + String tUploadNode = XssUtil.escapeJavaScript(request.getParameter("UploadNode")); + String tOtherNoType = XssUtil.escapeJavaScript(request.getParameter("OtherNoType")); + String tOtherNo = XssUtil.escapeJavaScript(request.getParameter("OtherNo")); + String tSubOtherNo = XssUtil.escapeJavaScript(request.getParameter("SubOtherNo")); + %> + <%--交互区域--%> + &OtherNo=<%=XssUtil.escapeJavaScript(request.getParameter("OtherNo"))%>&SubOtherNo=<%=XssUtil.escapeJavaScript(request.getParameter("SubOtherNo"))%>&UploadNode=<%=XssUtil.escapeJavaScript(request.getParameter("UploadNode"))%>" /> + <%--./LDAttachmentInput.jsp?OtherNoType=<%=XssUtil.escapeJavaScript(request.getParameter("OtherNoType"))%>&OtherNo=<%=XssUtil.escapeJavaScript(request.getParameter("OtherNo"))%>&SubOtherNo=<%=XssUtil.escapeJavaScript(request.getParameter("SubOtherNo"))%>&UploadNode=<%=XssUtil.escapeJavaScript(request.getParameter("UploadNode"))%>--%> + <%--下一步页面区域--%> + + + + + <body bgcolor="#ffffff"> + </body> + + + diff --git a/lis-module-grp-nb-schema/src/main/java/com/sinosoft/lis/sql/repository/LCCustomerIDSQL.java b/lis-module-grp-nb-schema/src/main/java/com/sinosoft/lis/sql/repository/LCCustomerIDSQL.java index 564c9fe7..7b1db8ed 100644 --- a/lis-module-grp-nb-schema/src/main/java/com/sinosoft/lis/sql/repository/LCCustomerIDSQL.java +++ b/lis-module-grp-nb-schema/src/main/java/com/sinosoft/lis/sql/repository/LCCustomerIDSQL.java @@ -26,4 +26,8 @@ public interface LCCustomerIDSQL { @SQL("select * from LcCustomerID where PolicyNo ='?tGrpContNo?' and IDFlag ='00' and IDTYPE ='6' and CustomerNo ='?tCustomerNo?'") LCCustomerIDSet getLCCustomerIDSetByGrpContNoAndCustomerNo(@Param("tGrpContNo") String tGrpContNo, @Param("tCustomerNo") String tCustomerNo); + + @SQL(value = "select IDType,EndDate from LCCustomerID where PolicyNo = '?grpContNo?' ") + SSRS getSSRSByGrpContNo(@Param("grpContNo") String grpContNo); + } \ No newline at end of file diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCCustomerImpartController.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCCustomerImpartController.java new file mode 100644 index 00000000..f4fae545 --- /dev/null +++ b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCCustomerImpartController.java @@ -0,0 +1,95 @@ +package com.sinosoft.lis.controller.g_app; + + +import cn.hutool.core.collection.CollectionUtil; +import com.sinosoft.lis.bl.LCCustomerImpartBL; +import com.sinosoft.lis.controller.Action; +import com.sinosoft.lis.controller.ResponseInfo; +import com.sinosoft.lis.controller.Service; + +import com.sinosoft.lis.i18n.I18nMessage; +import com.sinosoft.lis.pubfun.GlobalInput; +import com.sinosoft.lis.schema.LCCustomerImpartSchema; +import com.sinosoft.lis.vo.g_app.LCCustomerImpartAddVO; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.List; + +@Controller +@RequestMapping(value = Service.GRP_NB) +public class LCCustomerImpartController { + + private static final Logger logger = LoggerFactory.getLogger(LCCustomerImpartController.class); + + @ResponseBody + @ApiOperation("新单管理-->生成投保单-->投保书信息-->被保险人清单维护-->健康告知书附件上载-->健康保存") + @PostMapping(value = "/g_app/LCCustomerImpartSave/" + Action.ADD_ACTION) + public ResponseInfo add(@RequestBody LCCustomerImpartAddVO request) { + request.setAction(Action.ADD_ACTION); + return dealMethod(request); + } + + private ResponseInfo dealMethod(@RequestBody LCCustomerImpartAddVO lcCustomerImpartAddVO){ + String operator = Action.INSERT_ACTION; + ResponseInfo response = new ResponseInfo(); + GlobalInput tGI = GlobalInput.get(); + if (tGI == null) { + response.setContent(new I18nMessage("页面失效,请重新登陆", "LIS-18239").getMessage()); + response.fail(); + return response; + } + + List body = lcCustomerImpartAddVO.getBody(); + + if (CollectionUtil.isEmpty(lcCustomerImpartAddVO.getBody())){ + response.succ(); + return response; + } + + List schemaList = new ArrayList<>(); + + for (LCCustomerImpartAddVO.LCCustomerImpartAddParam param : body){ + String grpContNo = lcCustomerImpartAddVO.getGrpContNo(); + LCCustomerImpartSchema schema = new LCCustomerImpartSchema(); + schema.setGrpContNo(grpContNo); + schema.setContNo(grpContNo); + schema.setProposalContNo(grpContNo); + schema.setImpartCode(param.getImpartCode()); + schema.setImpartVer(param.getImpartVer()); + schema.setImpartContent(param.getImpartContent()); + schema.setImpartParamModle(param.getImpartParam()); + schema.setDescVal(param.getDescVal()); + schema.setPatchNo(1); + schema.setOperator(tGI.Operator); + schema.setCustomerNo(""); + schema.setCustomerNoType(""); + schemaList.add(schema); + } + + LCCustomerImpartBL lcCustomerImpartBL = new LCCustomerImpartBL(); + if (lcCustomerImpartBL.submitData(schemaList,operator)){ + response.setContent("操作成功"); + response.succ(); + }else { + response.setContent(lcCustomerImpartBL.getErrors().getLastError()); + response.fail(); + } + return response; + } + + + + + + + + +} diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCGrpContPolController.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCGrpContPolController.java index 8497409f..022a5cdf 100644 --- a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCGrpContPolController.java +++ b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCGrpContPolController.java @@ -411,6 +411,24 @@ public class LCGrpContPolController { String mOnJobNumber =request.getParameter("AllOnWorkPeoples"); String mRetireNumber = request.getParameter("AllOffWorkPeoples"); + //法人信息 + String mCorporation1 = request.getParameter("Corporation1"); + String mCorIDType1 = request.getParameter("CorIDType1"); + String mCorID1 = request.getParameter("CorID1"); + String mCorIDStartDate1 = request.getParameter("CorIDStartDate1"); + String mCorIDExpiryDate1 = request.getParameter("CorIDExpiryDate1"); + String mGrpType = request.getParameter("grpType"); + String mcDate = request.getParameter("cDate"); + String mBussarea = request.getParameter("bussarea"); + mLCGrpContSchema.setCorporation1(mCorporation1); + mLCGrpContSchema.setCorIDType1(mCorIDType1); + mLCGrpContSchema.setCorID1(mCorID1); + mLCGrpContSchema.setCorIDStartDate1(mCorIDStartDate1); + mLCGrpContSchema.setCorIDExpiryDate1(mCorIDExpiryDate1); + mLCGrpContSchema.setGrpType(mGrpType); + mLCGrpContSchema.setCDate(mcDate); + mLCGrpContSchema.setBussarea(mBussarea); + String mMainBusiness = request.getParameter("MainBusiness"); String mGrpNature = request.getParameter("GrpNature"); String mBusiCategory =request.getParameter("BusiCategory"); @@ -502,6 +520,13 @@ public class LCGrpContPolController { String mCountyCode = request.getParameter("CountyCode"); String mDetailAddress = request.getParameter("DetailAddress"); String mZipCode = request.getParameter("ZipCode"); + + // + + String mLinkProvinceCode = request.getParameter("LinkProvinceCode2"); + String mLinkCityCode = request.getParameter("LinkCityCode2"); + String mLinkCountyCode = request.getParameter("LinkCountyCode2"); + String mLinkDetailAddr = request.getParameter("LinkDetailAddr"); //--------------------------------------------------------------------------------------------------------------------- mLCGrpContactInfoSchema = new LCGrpContactInfoSchema(); mLCGrpContactInfoSchema.setGrpContNo(mGrpPropNo); @@ -512,6 +537,12 @@ public class LCGrpContPolController { mLCGrpContactInfoSchema.setCounty(mCountyCode); mLCGrpContactInfoSchema.setAddress(mDetailAddress); mLCGrpContactInfoSchema.setZipCode(mZipCode); + + mLCGrpContactInfoSchema.setLinkProvinceCode(mLinkProvinceCode); + mLCGrpContactInfoSchema.setLinkCityCode(mLinkCityCode); + mLCGrpContactInfoSchema.setLinkCountyCode(mLinkCountyCode); + mLCGrpContactInfoSchema.setLinkDetailAddr(mLinkDetailAddr); + //-------------------------------单位证件信息-------------------------------------------------------------- String mGrpIDType = request.getParameter("GrpIDType"); String mGrpID = request.getParameter("GrpID"); @@ -670,6 +701,13 @@ public class LCGrpContPolController { String mTaxBankAccNo = request.getParameter("TaxBankAccNo"); String mTaxPhone = request.getParameter("TaxPhone"); String mTaxAddress = request.getParameter("TaxAddress"); + // + String fuli = request.getParameter("fuli"); + String taxpayer = request.getParameter("Taxpayer"); + String invoice = request.getParameter("Invoice"); + mLCGrpInvoiceDetailSchema.setFuli(fuli); + mLCGrpInvoiceDetailSchema.setTaxpayer(taxpayer); + mLCGrpInvoiceDetailSchema.setInvoice(invoice); mLCGrpInvoiceDetailSchema.setGrpContNo(mGrpPropNo); diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/g_app/LCContPrtPrintBL.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/g_app/LCContPrtPrintBL.java index 4050f1a9..a13b63f8 100644 --- a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/g_app/LCContPrtPrintBL.java +++ b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/g_app/LCContPrtPrintBL.java @@ -10,6 +10,8 @@ import com.sinosoft.lis.sql.easyquery.g_print.TBNoticePrintSql; import com.sinosoft.lis.sql.g_app.LCContPrtPrintBLSQL; import com.sinosoft.lis.sql.g_app.LCInsuredDealBLSQL; import com.sinosoft.lis.sql.g_app.LCPolicySignBLSQL; +import com.sinosoft.lis.sql.repository.LCCustomerIDSQL; +import com.sinosoft.lis.sql.repository.LCCustomerImpartSQL; import com.sinosoft.lis.sql.repository.LCGrpContSQL; import com.sinosoft.lis.sql.repository.LCInsuredSQL; import com.sinosoft.persistence.SQLProxy; @@ -56,6 +58,8 @@ public class LCContPrtPrintBL implements BusinessService { private LCPolicySignBLSQL lcPolicySignBLSQL = SQLProxy.getInstance(LCPolicySignBLSQL.class); private ExeSQL mExeSQL = new ExeSQL(); private LCContPrtPrintBLSQL lcContPrtPrintBLSQL = SQLProxy.getInstance(LCContPrtPrintBLSQL.class); + private LCCustomerIDSQL lcCustomerIDSQL = SQLProxy.getInstance(LCCustomerIDSQL.class); + private LCCustomerImpartSQL lcCustomerImpartSQL = SQLProxy.getInstance(LCCustomerImpartSQL.class); private TBNoticePrintSql tbNoticePrintSql = SQLProxy.getInstance(TBNoticePrintSql.class); private LCGrpContSQL lcGrpContSQL = SQLProxy.getInstance(LCGrpContSQL.class); @@ -334,27 +338,29 @@ public class LCContPrtPrintBL implements BusinessService { buildError("dealData", new I18nMessage("查询投保单模板信息失败！", "")); return false; } - - jsonXmlExport.put("fromSystem","GRP"); + /******************************************************** + * 投保单模板信息 + *******************************************************/ + jsonXmlExport.put("fromSystem","GRP");//系统 jsonXmlExport.put("fromModule","NB"); - jsonXmlExport.put("businessNumber",mGrpPropNo); - jsonXmlExport.put("businessType",Code); - jsonXmlExport.put("requestId",PubFun1.CreateMaxNo("requestId", 10)); - jsonXmlExport.put("templateCode",nbPrintModelInfoByCode.GetText(1, 2)); - jsonXmlExport.put("versionNumber",nbPrintModelInfoByCode.GetText(1, 3)); - jsonXmlExport.put("isSealAllowed",nbPrintModelInfoByCode.GetText(1, 4)); + jsonXmlExport.put("businessNumber",mGrpPropNo);//投保单号 + jsonXmlExport.put("businessType",Code);//行业类别 + jsonXmlExport.put("requestId",PubFun1.CreateMaxNo("requestId", 10));//请求ID + jsonXmlExport.put("templateCode",nbPrintModelInfoByCode.GetText(1, 2));//模板编码 + jsonXmlExport.put("versionNumber",nbPrintModelInfoByCode.GetText(1, 3));//版本号 + jsonXmlExport.put("isSealAllowed",nbPrintModelInfoByCode.GetText(1, 4));//其他标识 JSONArray jsonArray = new JSONArray(); jsonXmlExport.put("params",jsonArray); JSONObject objectOne = new JSONObject(); - objectOne.put("filesOrder","1"); - objectOne.put("filesType","docx"); + objectOne.put("filesOrder","1");//文件顺序 + objectOne.put("filesType","docx");//文件类型 JSONObject objectOneData = new JSONObject(); objectOne.put("data",objectOneData); jsonArray.add(objectOne); objectOneData.put("SubType", "21001"); - objectOneData.put("AskPrtNo", mGrpPropNo); + objectOneData.put("AskPrtNo", mGrpPropNo);//投保单号 // jsonDATASET.put("Fax1", ""); // jsonDATASET.put("LinkMan2", ""); // jsonDATASET.put("Department2", ""); @@ -383,56 +389,81 @@ public class LCContPrtPrintBL implements BusinessService { // jsonDATASET.put("GrpNature1", ""); // objectOneData.put("PartnerName", "主要控股股东名称"); - SSRS lcGrpInfoSSRS = lcContPrtPrintBLSQL.getLCGrpInfoByGrpPropNo(mGrpPropNo); + + /******************************************************** + * 投保信息 + *******************************************************/ + SSRS rowData = lcGrpContSQL.selectGrpContByGRPCONTNO(mGrpPropNo); + String grpType = rowData.GetText(1, 1); //组织类型 + String grpNature = rowData.GetText(1, 2);//单位性质 + this.getGrpType(grpType,objectOneData); + this.getGrpNature(grpNature,objectOneData); + + + SSRS ssrsByGrpContNo = lcCustomerIDSQL.getSSRSByGrpContNo(mGrpPropNo);// + String IDType = ssrsByGrpContNo.GetText(1, 1);//证件类型 + this.getIDType(IDType,objectOneData); + + String endDate = ssrsByGrpContNo.GetText(1, 1);//证件有效期 + objectOneData.put("IDEndDate", endDate); + + + SSRS lcGrpInfoSSRS = lcContPrtPrintBLSQL.getLCGrpInfoByGrpPropNo(mGrpPropNo); if (lcGrpInfoSSRS.getMaxRow()==0 ) { buildError("dealData", new I18nMessage("查询保单信息失败！", "LIS-99999")); return false; } + + + /******************************************************** * 投保单位信息 *******************************************************/ // jsonDATASET.put("AskNo", lcGrpInfoSSRS.GetText(1,1)); - objectOneData.put("GrpName", lcGrpInfoSSRS.GetText(1,2)); - objectOneData.put("GrpAddress",lcGrpInfoSSRS.GetText(1,3)); - objectOneData.put("CorporationNo", lcGrpInfoSSRS.GetText(1,4)); - objectOneData.put("SocialNo",lcGrpInfoSSRS.GetText(1,5)); - objectOneData.put("GrpZipCode",lcGrpInfoSSRS.GetText(1,6)); - objectOneData.put("GrpNature", lcGrpInfoSSRS.GetText(1,7)); - objectOneData.put("BusinessType", lcGrpInfoSSRS.GetText(1,8)); - objectOneData.put("Peoples", lcGrpInfoSSRS.GetText(1,9)); - objectOneData.put("AllOnWorkPeoples", lcGrpInfoSSRS.GetText(1,10)); - objectOneData.put("AllOffWorkPeoples", lcGrpInfoSSRS.GetText(1,11)); - objectOneData.put("MainPeoples", lcGrpInfoSSRS.GetText(1,12)); - objectOneData.put("RelaPeoples", lcGrpInfoSSRS.GetText(1,13)); - objectOneData.put("TotalPeoples", lcGrpInfoSSRS.GetText(1,14)); - objectOneData.put("LinkMan1", lcGrpInfoSSRS.GetText(1,15)); - objectOneData.put("Department1", lcGrpInfoSSRS.GetText(1,16)); - objectOneData.put("MobilePhone1", lcGrpInfoSSRS.GetText(1,17)); + objectOneData.put("GrpName", lcGrpInfoSSRS.GetText(1,2));//投保单位名称 + objectOneData.put("GrpAddress",lcGrpInfoSSRS.GetText(1,3));//投保单位地址 + objectOneData.put("CorporationNo", lcGrpInfoSSRS.GetText(1,4));//投保单位证件号(idtype='2') + objectOneData.put("SocialNo",lcGrpInfoSSRS.GetText(1,5));//投保单位证号(idtype='4') + objectOneData.put("GrpZipCode",lcGrpInfoSSRS.GetText(1,6));//单位邮政编码 + objectOneData.put("GrpNature", lcGrpInfoSSRS.GetText(1,7));//单位性质 + objectOneData.put("BusinessType", lcGrpInfoSSRS.GetText(1,8));//行业类别 + objectOneData.put("Peoples", lcGrpInfoSSRS.GetText(1,9));//单位总人数 + objectOneData.put("AllOnWorkPeoples", lcGrpInfoSSRS.GetText(1,10));//单位在职人数 + objectOneData.put("AllOffWorkPeoples", lcGrpInfoSSRS.GetText(1,11));//单位退休人数 + objectOneData.put("MainPeoples", lcGrpInfoSSRS.GetText(1,12));//单位主被保险人数 + objectOneData.put("RelaPeoples", lcGrpInfoSSRS.GetText(1,13));//单位附属被保险人数 + objectOneData.put("TotalPeoples", lcGrpInfoSSRS.GetText(1,14));//单位合计 + objectOneData.put("LinkMan1", lcGrpInfoSSRS.GetText(1,15));//经办人姓名 + objectOneData.put("Department1", lcGrpInfoSSRS.GetText(1,16));//经办人所属部门 + objectOneData.put("MobilePhone1", lcGrpInfoSSRS.GetText(1,17));//经办人联系电话 // jsonDATASET.put("Phone1", lcGrpInfoSSRS.GetText(1,18)); - objectOneData.put("E_Mail1", lcGrpInfoSSRS.GetText(1,19)); - objectOneData.put("PayMode", lcGrpInfoSSRS.GetText(1,20)); - objectOneData.put("BankCode", lcGrpInfoSSRS.GetText(1,21)); - objectOneData.put("BankAccNo", lcGrpInfoSSRS.GetText(1,22)); - objectOneData.put("DisputedFlag", lcGrpInfoSSRS.GetText(1,23)); + objectOneData.put("E_Mail1", lcGrpInfoSSRS.GetText(1,19));//经办人所属邮箱 + objectOneData.put("PayMode", lcGrpInfoSSRS.GetText(1,20));//付款方式 + objectOneData.put("BankCode", lcGrpInfoSSRS.GetText(1,21));//开户银行 + objectOneData.put("BankAccNo", lcGrpInfoSSRS.GetText(1,22));//银行账号 + objectOneData.put("DisputedFlag", lcGrpInfoSSRS.GetText(1,23));//合同争议处理方式 objectOneData.put("CorpLicence", lcGrpInfoSSRS.GetText(1,24)); //企业法人营业执照 objectOneData.put("TaxRegNo",lcGrpInfoSSRS.GetText(1,25)); //税务登记证 objectOneData.put("SchoolLicence", lcGrpInfoSSRS.GetText(1,26)); //办学许可证 - objectOneData.put("PersonPrintFlag", lcGrpInfoSSRS.GetText(1,27)); + objectOneData.put("PersonPrintFlag", lcGrpInfoSSRS.GetText(1,27));//打印个人保险凭证 String tValDateType =lcGrpInfoSSRS.GetText(1,46); + //保险生效日期 if ("0".equals(tValDateType)) { objectOneData.put("CValiDate", "保费到帐日次日零时"); } else { objectOneData.put("CValiDate", lcGrpInfoSSRS.GetText(1,28)); } - objectOneData.put("PremApporFund", lcGrpInfoSSRS.GetText(1,29)); - objectOneData.put("PayIntv", lcGrpInfoSSRS.GetText(1,30)); - objectOneData.put("PrintType", lcGrpInfoSSRS.GetText(1,31)); - objectOneData.put("InsuYear",lcGrpInfoSSRS.GetText(1,32)); + objectOneData.put("PremApporFund", lcGrpInfoSSRS.GetText(1,29));//保险负担原则 + objectOneData.put("PayIntv", lcGrpInfoSSRS.GetText(1,30));//缴费方式 + objectOneData.put("PrintType", lcGrpInfoSSRS.GetText(1,31));//打印保单类型 + objectOneData.put("InsuYear",lcGrpInfoSSRS.GetText(1,32));//保险期限 double sumPrem=Double.parseDouble(lcGrpInfoSSRS.GetText(1,33)); + + //投保保险费合计大写(小写) if("3".equals(lcGrpInfoSSRS.GetText(1,59))){ double sumEnterPriseBurden = Double.parseDouble(lcGrpInfoSSRS.GetText(1,57)); double sumPersonBurden = Double.parseDouble(lcGrpInfoSSRS.GetText(1,58)); @@ -440,11 +471,12 @@ public class LCContPrtPrintBL implements BusinessService { }else { objectOneData.put("AskSumPrem", PubFun.getChnMoney(sumPrem)+"("+new DecimalFormat("0.00").format(sumPrem)+")"); } - objectOneData.put("GrpSpec",lcGrpInfoSSRS.GetText(1,34)); - objectOneData.put("Satrap",lcGrpInfoSSRS.GetText(1,35)); - objectOneData.put("Corporation", lcGrpInfoSSRS.GetText(1,36)); + objectOneData.put("GrpSpec",lcGrpInfoSSRS.GetText(1,34));//备注及特别约定 + objectOneData.put("Satrap",lcGrpInfoSSRS.GetText(1,35));//法人 + objectOneData.put("Corporation", lcGrpInfoSSRS.GetText(1,36));//负责人 + - objectOneData.put("ComArea", lcGrpInfoSSRS.GetText(1,47)); + objectOneData.put("ComArea", lcGrpInfoSSRS.GetText(1,47));// // String tDescriptionSolvency = getSolvency(lcGrpInfoSSRS.GetText(1, 50)); @@ -466,6 +498,29 @@ public class LCContPrtPrintBL implements BusinessService { objectOneData.put("ControlTRType", lcGrpInfoSSRS.GetText(1,63));//税收类型 objectOneData.put("InstitutionsCategory", lcGrpInfoSSRS.GetText(1,64));//机构类别 objectOneData.put("Satrap", lcGrpInfoSSRS.GetText(1,65));//负责人 + String areaCode = lcGrpInfoSSRS.GetText(1, 66); + this.getBussArea(objectOneData,areaCode);//运营区域 + objectOneData.put("MainBusiness",lcGrpInfoSSRS.GetText(1,67));//经营范围 + objectOneData.put("CorID", lcGrpInfoSSRS.GetText(1,68));//负责人证件号 + objectOneData.put("CorIDExpiryDate", lcGrpInfoSSRS.GetText(1,69));//负责人证件有效期 + objectOneData.put("Corporation1", lcGrpInfoSSRS.GetText(1,70));//法人 + objectOneData.put("CorID1", lcGrpInfoSSRS.GetText(1,71));//法人证件号 + objectOneData.put("CorIDExpiryDate1", lcGrpInfoSSRS.GetText(1,72));//法人证件有效期 + objectOneData.put("LinkIdNo", lcGrpInfoSSRS.GetText(1,73));//经办人证件号码 + objectOneData.put("TaxpayerNo", lcGrpInfoSSRS.GetText(1,74));//纳税人识别号 + objectOneData.put("TaxAddress", lcGrpInfoSSRS.GetText(1,75));//税务登记地址 + objectOneData.put("TaxPhone", lcGrpInfoSSRS.GetText(1,76));//税务登记电话 + objectOneData.put("TaxBankName", lcGrpInfoSSRS.GetText(1,77));//税务等户开户行 + + + + /******************************************************** + * 健康告知 + *******************************************************/ + this.getCustomerImpart(objectOneData); + + + /******************************************************** * 投保险种信息 @@ -1387,4 +1442,194 @@ public class LCContPrtPrintBL implements BusinessService { return mErrors; } + + public void getGrpType (String grpType,JSONObject objectOneData) { + objectOneData.put("Z1", "£"); + objectOneData.put("Z2", "£"); + objectOneData.put("Z3", "£"); + objectOneData.put("Z4", "£"); + objectOneData.put("Z5", "£"); + objectOneData.put("Z6", "£"); + objectOneData.put("Z7", "£"); + objectOneData.put("Z8", "£"); + objectOneData.put("Z9", "£"); + switch (grpType) { + case "01":objectOneData.put("Z1", "R"); + case "02":objectOneData.put("Z2", "R"); + case "03":objectOneData.put("Z3", "R"); + case "04":objectOneData.put("Z4", "R"); + case "05":objectOneData.put("Z5", "R"); + case "06":objectOneData.put("Z6", "R"); + case "07":objectOneData.put("Z7", "R"); + case "08":objectOneData.put("Z8", "R"); + case "09":objectOneData.put("Z9", "R"); + break; + } + } + + + + public void getGrpNature (String grpNature,JSONObject objectOneData) { + objectOneData.put("D1", "£"); + objectOneData.put("D2", "£"); + objectOneData.put("D3", "£"); + objectOneData.put("D4", "£"); + objectOneData.put("D5", "£"); + objectOneData.put("D6", "£"); + objectOneData.put("D7", "£"); + objectOneData.put("D8", "£"); + objectOneData.put("D9", "£"); + switch (grpNature) { + case "02":objectOneData.put("D2", "R"); + case "03":objectOneData.put("D1", "R"); + case "04":objectOneData.put("D7", "R"); + case "05":objectOneData.put("D4", "R"); + case "06":objectOneData.put("D6", "R"); + case "07":objectOneData.put("D5", "R"); + case "08":objectOneData.put("D3", "R"); + case "09":objectOneData.put("D8", "R"); + case "10":objectOneData.put("D9", "R"); + objectOneData.put("grpNature", grpNature); + break; + } + } + + public void getIDType (String IdType,JSONObject objectOneData) { + objectOneData.put("A1", "£"); + objectOneData.put("A2", "£"); + objectOneData.put("A3", "£"); + objectOneData.put("A4", "£"); + objectOneData.put("A5", "£"); + switch (IdType) { + case "1":objectOneData.put("A2", "R"); + case "6":objectOneData.put("A1", "R"); + case "9":objectOneData.put("A5", "R"); + objectOneData.put("IdType", IdType); + break; + } + } + + public void getCustomerImpart (JSONObject objectOneData) { + SSRS lcCustomerList = lcCustomerImpartSQL.selectCustomerImpartByGrpContNo(mGrpPropNo); + objectOneData.put("H1","£"); + objectOneData.put("H2","£"); + objectOneData.put("H3","£"); + objectOneData.put("H4","£"); + objectOneData.put("H5","£"); + objectOneData.put("H6","£"); + objectOneData.put("H7","£"); + objectOneData.put("H8","£"); + objectOneData.put("H9","£"); + objectOneData.put("H10","£"); + objectOneData.put("H11","£"); + objectOneData.put("H12","£"); + objectOneData.put("H13","£"); + objectOneData.put("H14","£"); + objectOneData.put("H15","£"); + objectOneData.put("H16","£"); + objectOneData.put("H17","£"); + objectOneData.put("H18","£"); + objectOneData.put("H19","£"); + objectOneData.put("H20","£"); + + if (lcCustomerList.getMaxRow() > 0) { + String impartParamModle = lcCustomerList.GetText(1, 4); + if (StringUtils.isNotBlank(impartParamModle)) { + String[] split = impartParamModle.split("/"); + + if (StringUtils.isNotEmpty(split[0])){ + objectOneData.put("HM1", split[0]); + } + if (StringUtils.isNotEmpty(split[1])){ + objectOneData.put("HM2", split[1]); + } + + objectOneData.put("H19", "R"); + } + + + String impartParamModl1 = lcCustomerList.GetText(2, 4); + + if (StringUtils.isNotBlank(impartParamModl1)) { + + String[] split = impartParamModl1.split("/"); + + if (StringUtils.isNotEmpty(split[0])){ + objectOneData.put("HY", split[0]); + } + if (StringUtils.isNotEmpty(split[1])){ + objectOneData.put("HP1", split[1]); + } + + if (StringUtils.isNotEmpty(split[2])){ + objectOneData.put("HP2", split[2]); + } + + if (StringUtils.isNotEmpty(split[3])){ + objectOneData.put("HP3", split[3]); + } + + if (StringUtils.isNotEmpty(split[4])){ + objectOneData.put("HP4", split[4]); + } + objectOneData.put("H1", "R"); + } + + + String impartParamModl2 = lcCustomerList.GetText(3, 4); + if (StringUtils.isNotBlank(impartParamModl2) && impartParamModl2.equals("是")) { + objectOneData.put("H3", "R"); + } + + String impartParamModl3 = lcCustomerList.GetText(4, 4); + if (StringUtils.isNotBlank(impartParamModl3) && impartParamModl3.equals("是")) { + objectOneData.put("H5", "R"); + } + String impartParamModl4 = lcCustomerList.GetText(5, 4); + if (StringUtils.isNotBlank(impartParamModl4) && impartParamModl4.equals("是")) { + objectOneData.put("H7", "R"); + } + String impartParamModl5 = lcCustomerList.GetText(6, 4); + if (StringUtils.isNotBlank(impartParamModl5) && impartParamModl5.equals("是")) { + objectOneData.put("H9", "R"); + } + String impartParamModl6 = lcCustomerList.GetText(7, 4); + if (StringUtils.isNotBlank(impartParamModl6) && impartParamModl6.equals("是")) { + objectOneData.put("H11", "R"); + } + String impartParamModl7 = lcCustomerList.GetText(8, 4); + if (StringUtils.isNotBlank(impartParamModl7) && impartParamModl7.equals("是")) { + objectOneData.put("H13", "R"); + } + String impartParamModl8 = lcCustomerList.GetText(9, 4); + if (StringUtils.isNotBlank(impartParamModl8) && impartParamModl8.equals("是")) { + objectOneData.put("H15", "R"); + } + String impartParamModl9 = lcCustomerList.GetText(10, 4); + if (StringUtils.isNotBlank(impartParamModl9) && impartParamModl9.equals("是")) { + objectOneData.put("H17", "R"); + } + } + } + public void getBussArea(JSONObject objectOneData,String areaCode){ + + objectOneData.put("B1", "£"); + objectOneData.put("B2", "£"); + objectOneData.put("B3", "£"); + + if (StringUtils.isNotBlank(areaCode)) { + switch (areaCode) { + case "01": objectOneData.put("B1","R"); + case "02": objectOneData.put("B2","R"); + case "03": objectOneData.put("B3","R"); + break; + } + + } + + + } + + + } diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCGrpPropQuerySql.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCGrpPropQuerySql.java index 144dd0a7..2fa794f1 100644 --- a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCGrpPropQuerySql.java +++ b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCGrpPropQuerySql.java @@ -16,7 +16,7 @@ public interface LCGrpPropQuerySql { // @Clause(key = 3, clause = "and a.salechnl = '#{para3}' ", expression = "#{para3} != empty"), // @Clause(key = 4, clause = "and exists(select 1 from lcagenttocont c where c.policyno=a.grpcontno and c.agentcode = '#{para4}')", expression = "#{para4} != empty")}) // SSRS LCGrpPropQuerySql1(@Param("para0") String para0, @Param("para1") String para1, @Param("para2") String para2, @Param("para3") String para3, @Param("para4") String para4); - @SQL(value = "select * from (select a.grpcontno,a.prtno,(select codename from ldcode where codetype = 'salechannel' AND code = a.agenttype),b.name,a.CValiDate,(SELECT f.activityname FROM lwactivity f WHERE f.ActivityID=w.ActivityID),( SELECT codename FROM ldcode where codetype = 'contstate' AND code = a.state),( SELECT sum(j.sumduepaymoney) FROM ljspay j where j.otherno = a.grpcontno AND j.paycount = '1' AND j.state = '2'),a.firstpaydate,( SELECT t.contplantype FROM lcproposal t WHERE t.grppropno = a.prtno), a.manageCom,c.AgentCode CustomerNo , a.agenttype,a.makedate from lcgrpcont a,lwmission w,lcgrpappnt b ,LCAgentToCont c WHERE a.grpcontno = b.grpcontno and c.PolicyNo = b.GrpContNo and a.GrpContNo = w.MissionProp1 AND a.state = '00' and w.ActivityID !='1800201005' union SELECT a.grpcontno, a.prtno, (SELECT codename from ldcode WHERE codetype = 'salechannel' AND code = a.agenttype), b.name, a.CValiDate, '',( SELECT codename FROM ldcode WHERE codetype = 'contstate' AND code = a.state),'', '', ( SELECT t.contplantype FROM lcproposal t WHERE t.grppropno = a.prtno), a.manageCom, c.AgentCode CustomerNo , a.agenttype,a.makedate FROM lcgrpcont a, lcgrpappnt b,LCAgentToCont c WHERE a.grpcontno = b.grpcontno and c.PolicyNo = b.GrpContNo AND a.state in (01,02)) g where 1=1 @{1} @{2} @{3} @{4} group by g.makedate desc,g.grpcontno ", clauses = { + @SQL(value = "select * from (select a.grpcontno,a.prtno,(select codename from ldcode where codetype = 'salechannel' AND code = a.agenttype),b.name,a.CValiDate,(SELECT f.activityname FROM lwactivity f WHERE f.ActivityID=w.ActivityID),( SELECT codename FROM ldcode where codetype = 'contstate' AND code = a.state),( SELECT sum(j.sumduepaymoney) FROM ljspay j where j.otherno = a.grpcontno AND j.paycount = '1' AND j.state = '2'),a.firstpaydate,( SELECT t.contplantype FROM lcproposal t WHERE t.grppropno = a.prtno), a.manageCom,c.AgentCode CustomerNo , a.agenttype,a.makedate from lcgrpcont a,lwmission w,lcgrpappnt b ,LCAgentToCont c WHERE a.grpcontno = b.grpcontno and c.PolicyNo = b.GrpContNo and a.GrpContNo = w.MissionProp1 AND a.state = '00' and w.ActivityID !='1800201005' union SELECT a.grpcontno, a.prtno, (SELECT codename from ldcode WHERE codetype = 'salechannel' AND code = a.agenttype), b.name, a.CValiDate, '',( SELECT codename FROM ldcode WHERE codetype = 'contstate' AND code = a.state),'', '', ( SELECT t.contplantype FROM lcproposal t WHERE t.grppropno = a.prtno), a.manageCom, c.AgentCode CustomerNo , a.agenttype,a.makedate FROM lcgrpcont a, lcgrpappnt b,LCAgentToCont c WHERE a.grpcontno = b.grpcontno and c.PolicyNo = b.GrpContNo AND a.state in (01,02)) g where 1=1 @{1} @{2} @{3} @{4} ", clauses = { @Clause(key = 0, clause = "#{para0}", expression = "#{para0} != empty"), @Clause(key = 1, clause = "and g.managecom like concat('#{para1}','%')", expression = "#{para1} != empty"), @Clause(key = 2, clause = "and g.prtno = '#{para2}' ", expression = "#{para2} != empty"), diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/g_app/LCContPrtPrintBLSQL.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/g_app/LCContPrtPrintBLSQL.java index 756fa309..8f36d278 100644 --- a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/g_app/LCContPrtPrintBLSQL.java +++ b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/g_app/LCContPrtPrintBLSQL.java @@ -70,8 +70,8 @@ public interface LCContPrtPrintBLSQL { ), a.prem, a.GrpSpec, - a.Corporation, - a.Corporation, + b.Corporation, + b.Corporation, (select Name from ldcom where comcode=a.ManageCom), (select codename from ldcode ld where codetype='opersource' and code=e.opersource), (select codename from ldcode ld where codetype='opersourcetype' and code=e.OperSourceType), @@ -110,13 +110,25 @@ public interface LCContPrtPrintBLSQL { b.ControlTRType, b.InstitutionsCategory, b.Satrap, - a.OutPayFlag + a.bussarea, + a.MainBussiness, + b.corID, + TO_CHAR(b.CorIDExpiryDate, 'YYYY"年"FMmm"月"FMDD"日"')AS CorIDExpiryDate, + a.Corporation1, + a.CorID1, + TO_CHAR(a.CorIDExpiryDate1, 'YYYY"年"FMmm"月"FMDD"日"')AS CorIDExpiryDate1, + d.IDNo, + f.TaxpayerNo, + f.Address, + f.Phone, + f.BankName from lcgrpcont a JOIN LCGrpAppnt b ON a.GrpContNo = b.GrpContNo JOIN LCGrpContactInfo c ON a.GrpContNo = c.GrpContNo JOIN LCGrpLink d ON a.GrpContNo = d.GrpContNo JOIN LCCustomerAccount lcc ON lcc.PolicyNo = a.GrpContNo JOIN lcgrpcontexpand e ON a.GrpContNo = e.GrpContNo + JOIN LCGrpInvoiceDetail f ON a.GrpContNo = f.GrpContNo WHERE d.LinkManFlag='00' and a.GrpContNo ='?mGrpPropNo?' """) SSRS getLCGrpInfoByGrpPropNo(@Param("mGrpPropNo") String mGrpPropNo); diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/vo/g_app/LCCustomerImpartAddVO.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/vo/g_app/LCCustomerImpartAddVO.java new file mode 100644 index 00000000..a91cff46 --- /dev/null +++ b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/vo/g_app/LCCustomerImpartAddVO.java @@ -0,0 +1,54 @@ +package com.sinosoft.lis.vo.g_app; + + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class LCCustomerImpartAddVO { + + @ApiModelProperty("投保单号") + private String grpContNo; + + @ApiModelProperty("操作") + private String action; + + @ApiModelProperty("详细数据") + private List body; + + + @Data + public static class LCCustomerImpartAddParam{ + + + @ApiModelProperty("投保单号") + private String grpContNo; + + @ApiModelProperty("告知版别") + private String impartVer; + + @ApiModelProperty("告知编码") + private String impartCode; + + @ApiModelProperty("告知内容") + private String impartContent; + + @ApiModelProperty("填写内容") + private String impartParam; + + @ApiModelProperty("详细说明") + private String descVal; + } + + + + +} diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCContCommonInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/LCContCommonInput.js index 2820287c..a42092d7 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCContCommonInput.js +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCContCommonInput.js @@ -545,6 +545,21 @@ function showAttachment() { } } +/** + * 附件管理(健康告知书) + */ +function showHealthAttachment() { + if(tFlag == '4'|| tFlag == '5'){ + mainRequest(); + window.open("../g_busicommon/LDHealthAttachmentMain.jsp?OtherNoType=NB&OtherNo="+tGrpContNo+"&UploadNode="+tActivityID,"附件管理",'width=950,height=520,top=0,left=0,toolbar=0,location=0,directories=0,menubar=0,scrollbars=1,resizable=1,status=0'); + + }else{ + mainRequest(); + window.open("../g_busicommon/LDHealthAttachmentMain.jsp?OtherNoType=NB&OtherNo="+tGrpPropNo+"&UploadNode="+tActivityID,"附件管理",'width=950,height=520,top=0,left=0,toolbar=0,location=0,directories=0,menubar=0,scrollbars=1,resizable=1,status=0'); + + } +} + /** * 保单保全查询窗口 */ diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompContPolInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompContPolInput.js index c5942e8c..5c35ad27 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompContPolInput.js +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompContPolInput.js @@ -1312,10 +1312,10 @@ function saveClick(){ // tBFFlag = "0"; // } - /*if(relationbtn == 0) { + if(relationbtn == 0) { alert("请进行关联方模糊认定查询后，再进行下一步"); return false; - }*/ + } if(!checkPeriod()){ return false; } @@ -4141,7 +4141,7 @@ function InsureListProtect(){ /** * 关联方模糊认定结果 */ -var relationbtn=1; +var relationbtn=0; function relationresult() { relationbtn+=1; var numFlag = 0; diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.js index f71da52b..e3090378 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.js +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.js @@ -1383,10 +1383,10 @@ function saveClick(){ // tBFFlag = "0"; // } - // if(relationbtn == 0) { - // alert("请进行关联方模糊认定查询后，再进行下一步"); - // return false; - // } + if(relationbtn == 0) { + alert("请进行关联方模糊认定查询后，再进行下一步"); + return false; + } if(!checkPeriod()){ return false; } diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js index 9132c012..56dd6603 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js @@ -334,6 +334,19 @@ function clearCounty(){ document.all("CountyName").value = ""; document.all("CountyCode").value = ""; } + +function clearCityAndCounty2(){ + + document.getElementById("LinkCity2").value = ""; + document.getElementById("LinkCityCode2").value = ""; + document.getElementById("LinkCounty2").value = ""; + document.getElementById("LinkCountyCode2").value = ""; +} +function clearCounty2(){ + document.getElementById("LinkCounty2").value = ""; + document.getElementById("LinkCountyCode2").value = ""; +} + /** * 清空关联查询的项目 */ @@ -1022,6 +1035,17 @@ function initEntry1(tGContNo){ document.all("GrpNatureName3").value=tPropEntry[0][58]; document.all("OtherIDType").value=tPropEntry[0][59]; document.all("OtherIDNo").value=tPropEntry[0][60]; + document.all("grpType").value=tPropEntry[0][62]; + document.all("grpTypeName").value=tPropEntry[0][63]; + document.all("cDate").value=tPropEntry[0][64]; + document.all("bussarea").value=tPropEntry[0][65]; + document.all("bussareaName").value=tPropEntry[0][66]; + document.all("Corporation1").value=tPropEntry[0][67]; + document.all("CorIDType1").value=tPropEntry[0][68]; + document.all("CorIDTypeName1").value=tPropEntry[0][69]; + document.all("CorID1").value=tPropEntry[0][70]; + document.all("CorIDStartDate1").value=tPropEntry[0][71]; + document.all("CorIDExpiryDate1").value=tPropEntry[0][72]; } } //初始化省市县 @@ -1043,6 +1067,13 @@ function initEntry2(tGContNo){ document.all("CountyName").value=tPropEntry[0][6]; document.all("DetailAddress").value=tPropEntry[0][7]; document.all("ZipCode").value=tPropEntry[0][8]; + document.all("LinkProvinceCode2").value=tPropEntry[0][9]; + document.all("LinkProvince2").value=tPropEntry[0][10]; + document.all("LinkCityCode2").value=tPropEntry[0][11]; + document.all("LinkCity2").value=tPropEntry[0][12]; + document.all("LinkCountyCode2").value=tPropEntry[0][13]; + document.all("LinkCounty2").value=tPropEntry[0][14]; + document.all("LinkDetailAddr").value=tPropEntry[0][15]; } } //初始化联系人信息 @@ -1198,6 +1229,12 @@ function initEntry13(tGContNo){ document.all("IsElecInvoicePrint").value=tTaxEntry[0][8]; document.all("IsElecInvoicePrintName").value=tTaxEntry[0][9]; document.all("ElectInvoiceEmail").value=tTaxEntry[0][10]; + document.all("fuli").value=tTaxEntry[0][11]; + document.all("fuliName").value=tTaxEntry[0][12]; + document.all("Taxpayer").value=tTaxEntry[0][13]; + document.all("TaxpayerName").value=tTaxEntry[0][14]; + document.all("Invoice").value=tTaxEntry[0][15]; + document.all("InvoiceName").value=tTaxEntry[0][16]; } } //客户经理 @@ -1403,10 +1440,10 @@ function saveClick(){ // tBFFlag = "0"; // } - // if(relationbtn == 0) { - // alert("请进行关联方模糊认定查询后，再进行下一步"); - // return false; - // } + if(relationbtn == 0) { + alert("请进行关联方模糊认定查询后，再进行下一步"); + return false; + } if(!checkPeriod()){ return false; } @@ -2925,6 +2962,32 @@ function checkCoridtype(){ } +function checkCoridtype2(){ + + if(document.all("CorID1").value.length>0 && document.all("CorIDType1").value=="") { + i18nAlert("请先选择证件类型！", "LIS-00574"); + return false; + } + + if(document.all("CorIDType1").value=="0"&&document.all("CorID1").value.length>0) { + + if((document.all("CorID1").value.length!=15) &&(document.all("CorID1").value.length!=18)){ + i18nAlert("输入的身份证号位数错误", "LIS-00575"); + document.all('CorID1').value=""; + return false; + } + + if(!checkIdCard(document.all("CorID1").value)) { + + i18nAlert("身份证号码不合法", "LIS-01833") ; + document.all('CorID1').value=""; + document.all('CorID1').className = "warn"; + return false; + } + } +} + + function checkCity(){ var ManageCom =document.all('ManageCom').value; var ProvinceCode =document.all('ProvinceCode').value; @@ -3014,7 +3077,6 @@ function returnShowCodeList(value1, value2, value3) { returnShowCode(value1, value2, value3, '0'); } - function returnShowCodeListKey(value1, value2, value3) { returnShowCode(value1, value2, value3, '1'); @@ -3036,7 +3098,22 @@ function returnShowCode(value1, value2, value3, returnType) { } else { return showCodeListKey('city',value2,value3,null,tProvince,'UpPlaceName','1',180); } - } else if (value1=='bankcity') { + }else if (value1=='Linkcity') { + + if (isEmpty(fm.LinkProvinceCode2)) { + i18nAlert("请选择省！", "LIS-00795"); + return false; + } + + var tProvince = document.all("LinkProvinceCode2").value; + + + if (returnType=='0') { + return showCodeList('city',value2,value3,null,tProvince,'UpPlaceName','1',180); + } else { + return showCodeListKey('city',value2,value3,null,tProvince,'UpPlaceName','1',180); + } + }else if (value1=='bankcity') { if (isEmpty(fm.BankProvinceName)) { i18nAlert("请选择省！", "LIS-00795"); @@ -3064,6 +3141,25 @@ function returnShowCode(value1, value2, value3, returnType) { var tCity = document.all("CityCode").value; + if (returnType=='0') { + return showCodeList('district',value2,value3,null,tCity,'UpPlaceName','1',180); + } else { + return showCodeListKey('district',value2,value3,null,tCity,'UpPlaceName','1',180); + } + }else if (value1=='Linkdistrict') { + + if (isEmpty(fm.LinkProvinceCode2)) { + i18nAlert("请选择省！", "LIS-00795"); + return false; + } + + if (isEmpty(fm.LinkCityCode2)) { + i18nAlert("请选择市！", "LIS-00796"); + return false; + } + + var tCity = document.all("LinkCityCode2").value; + if (returnType=='0') { return showCodeList('district',value2,value3,null,tCity,'UpPlaceName','1',180); } else { @@ -3403,7 +3499,11 @@ function afterCodeSelect(o, p){ if(p.name=="BankProvince"){ document.all("BankCity").value=""; document.all("BankCityName").value=""; - + } else if(p.name=="LinkProvince2"){ + document.getElementById("LinkCityCode2").value=""; + document.getElementById("LinkCity2").value=""; + document.getElementById("LinkCounty2").value=""; + document.getElementById("LinkCountyCode2").value=""; } else { document.all("CityCode").value=""; document.all("CityName").value=""; @@ -3411,7 +3511,10 @@ function afterCodeSelect(o, p){ document.all("CountyCode").value=""; } } else if(o=="city"){ - if(p.name=="CityName"){ + if(p.name=="LinkCity2"){ + document.getElementById("LinkCounty2").value=""; + document.getElementById("LinkCountyCode2").value=""; + } else if(p.name=="CityName"){ document.all("CountyName").value=""; document.all("CountyCode").value=""; } @@ -3684,6 +3787,48 @@ function calEndDate(code, type) { } } + +function calEndDate2(code, type) { + + if (fm.IDType.value == '0' && type == "IDType1") { + var tapage = getAgeFromIdCard(fm.IDNo.value,fm.IDStartDate.value); + if (tapage < 16) { + var tyear = caldateYear(fm.IDStartDate.value, 5); + fm.IDEndDate.value = tyear; + } + if (16 <= tapage && tapage <= 25) { + var tyear = caldateYear(fm.IDStartDate.value, 10); + fm.IDEndDate.value = tyear; + } + if (26 <= tapage && tapage <= 45) { + var tyear = caldateYear(fm.IDStartDate.value, 20); + fm.IDEndDate.value = tyear; + } + if (tapage >= 46) { + fm.IDExpDate.value = '9999-01-01'; + } + } + + if (fm.CorIDType.value == '0' && type == "CorIDType") { + var tapage = getAgeFromIdCard(fm.CorID.value,fm.CorIDStartDate.value); + if (tapage < 16) { + var tyear = caldateYear(fm.CorIDStartDate.value, 5); + fm.CorIDExpiryDate.value = tyear; + } + if (16 <= tapage && tapage <= 25) { + var tyear = caldateYear(fm.CorIDStartDate.value, 10); + fm.CorIDExpiryDate.value = tyear; + } + if (26 <= tapage && tapage <= 45) { + var tyear = caldateYear(fm.CorIDStartDate.value, 20); + fm.CorIDExpiryDate.value = tyear; + } + if (tapage >= 46) { + fm.CorIDExpiryDate.value = '9999-01-01'; + } + } +} + function getAgeFromIdCard(idCard,StartDate) { // 校验身份证号基本格式 if (!idCard || (idCard.length !== 15 && idCard.length !== 18)) { @@ -4489,7 +4634,7 @@ function InsureListProtect(){ /** * 关联方模糊认定结果 */ -var relationbtn= 1 ; +var relationbtn= 0 ; function relationresult() { relationbtn+=1; var numFlag = 0; diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp index 92881f14..a67453da 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp @@ -109,8 +109,8 @@ 保险期间 - <%-- --%> - + +<%-- --%> 投保申请日期 @@ -138,8 +138,7 @@ 是否为关联交易 -<%-- --%> - + @@ -336,6 +335,42 @@ 合计 + + + 组织类型 + + + 成立日期 + + + 经营区域 + + + + +<%-- --%> + +<%-- 联系地址--%> +<%-- --%> +<%-- 省--%> +<%-- 市--%> +<%-- 区/县--%> +<%-- --%> +<%-- --%> +<%-- --%> + + + + 联系地址 + + 省 + 市 + 区/县 + + + + + 单位性质 @@ -346,22 +381,40 @@ 单位联系电话 + + + <%-- 单位传真--%> + <%-- --%> + 法人姓名 + + 法人证件类型 + + 法人证件号码 + + + + 法人证件有效起期 + + + 法人证件有效止期 + + <%-- 单位传真--%> <%-- --%> - 法人/负责人姓名 - - 法人/负责人证件类型 - - 法人/负责人证件号码 - + 负责人姓名 + + 负责人证件类型 + + 负责人证件号码 + - 法人/负责人证件有效起期 - + 负责人证件有效起期 + - 法人/负责人证件有效止期 - + 负责人证件有效止期 + 单位地址 @@ -535,6 +588,14 @@ <%--电子发票--%> + + 开通弹性福利平台 + + 纳税人类型 + + 开票样式 + + 电子发票 diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCInsuredInfoInput.jsp b/lis-module-grp-nb-web/src/main/webapp/g_app/LCInsuredInfoInput.jsp index b9818b7b..57b28f47 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCInsuredInfoInput.jsp +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCInsuredInfoInput.jsp @@ -118,7 +118,7 @@ <%-- --%>