`fix`

src/cas_v0.2.0.1/src/main/java/com/loygra/cas/bean/CasUserInfo.java

@@ -144,6 +144,8 @@ public class CasUserInfo extends BaseBean {
 
 
 	private String exp_time;
+
+	private Date last_downloadtime;
  	//
  	@Code
  	private Long education;
@@ -154,4 +156,6 @@ public class CasUserInfo extends BaseBean {
  	
  	//
  	private String evaluation;
+
+	private String bh;
 }

src/cas_v0.2.0.1/src/main/java/com/loygra/cas/bo/CasParam.java

@@ -50,6 +50,8 @@ public class CasParam extends BaseParamBO {
 
 
 	private String exp_time;
+
+	private Date last_downloadtime;
  	//
  	private Integer company_sex;
 

src/cas_v0.2.0.1/src/main/java/com/loygra/cas/controller/oss/CasOssController.java

@@ -7,7 +7,9 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.loygra.bo.PageBean;
 import com.loygra.cas.bean.CasUnitInfo;
+import com.loygra.cas.bean.CasUserInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -175,7 +177,15 @@ public class CasOssController extends BaseController {
 					param.setAge_max( param.getAge_max()==null?1000:param.getAge_max());
 					param.setAge_min( param.getAge_min()==null?0:param.getAge_min());
 				}
+
 				resultMap=super.service.selectPageList("CasUserInfo.select", getPageBean(paged, pageSize), param);
+				try {
+					Map<String, Object> res1 = ossCasService.selectListCasUser(new CasParam());
+					for (int i = 0; i < ((PageBean) resultMap.get("data")).getData().size(); i++) {
+						getbh((List<CasUserInfoBO>) getData(res1), ((List<CasUserInfo>) ((PageBean) resultMap.get("data")).getData()).get(i));
+					}
+				}catch (Exception e){}
+
 			}else {
 				putStatusCode(resultMap, Code.RESPONSE_CODE.USER_NEED_LOGIN);
 			}
@@ -184,7 +194,46 @@ public class CasOssController extends BaseController {
 		}
 		return getModelAndView(resp, resultMap);
 	}
-	
+
+
+	private void getbh(List<CasUserInfoBO> alluser, CasUserInfo pu){
+		String bh = "";
+		StringBuilder bh1 = new StringBuilder();
+
+		try{
+			List<CasUserInfoBO> all = alluser;
+			int index = 1;
+			for (CasUserInfoBO b:all
+			) {
+				if(b.getId().equals(pu.getId())){
+					break;
+				}else{
+					index++;
+				}
+
+			}
+			index+=100;
+			bh1.append(index);
+		}catch (Exception e){
+
+		}
+
+		if(bh1.length()<4){
+			for (int i=0;i<4-bh1.length();i++){
+				bh1.insert(0, "0");
+			}
+		}
+		if(pu.getAid()==null||pu.getAid().equals(0L)){
+			bh = "暂未设置";
+		}else if(pu.getAid().equals(1L)){
+			bh = "GX2"+bh1;
+		}else if(pu.getAid().equals(2L)){
+			bh = "GP2"+bh1;
+		}else if(pu.getAid().equals(3L)){
+			bh = "GG2"+bh1;
+		}
+		pu.setBh(bh);
+	}
 	
 	
 	/**

src/cas_v0.2.0.1/src/main/java/com/loygra/cas/controller/oss/CasOssViewController.java

@@ -2,10 +2,7 @@
 package com.loygra.cas.controller.oss;
 
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
@@ -16,6 +13,7 @@ import com.loygra.cas.service.OssCasService;
 import com.loygra.service.LspCodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -305,7 +303,32 @@ public class CasOssViewController extends BaseController {
 		return getModelAndView(resp, resultMap, "oss/cas/user_manages", "info");
 	}
 
+	@RequestMapping(method = RequestMethod.GET, value = "/member/downcertificat")
+	public ModelAndView downloadcertificatInfo(HttpServletRequest req, HttpServletResponse resp){
+		Map<String, Object> resultMap = getResultMap();
+		LspUserInfoBO u = (LspUserInfoBO)req.getSession().getAttribute("user");
+		CasParam p = new CasParam();
+		p.setLsp_user_id(u.getId());
+		Map<String, Object> res = ossCasService.selectOneCasUser(p);
+		CasParam pu = (CasParam)getData(res);
+		pu.getCas_user().setLast_downloadtime(new Date());
+		ossCasService.updateCasUser(pu);
+		return new ModelAndView();
+	}
 
+
+	@RequestMapping(method = RequestMethod.POST, value = "/member/setcertificat")
+	public ModelAndView setcertificatInfo(HttpServletRequest req, HttpServletResponse resp, @RequestBody Map<String,Object> data){
+
+		CasParam p = new CasParam();
+		p.setLsp_user_id(Long.parseLong(data.get("userid").toString()));
+		Map<String, Object> res = ossCasService.selectOneCasUser(p);
+		CasParam pu = (CasParam)getData(res);
+		pu.getCas_user().setAid(Long.parseLong(data.get("ctype").toString()));
+		pu.getCas_user().setExp_time((data.get("expdate").toString()));
+		ossCasService.updateCasUser(pu);
+		return new ModelAndView();
+	}
 	@RequestMapping(method = RequestMethod.GET, value = "/member/certificat")
 	public ModelAndView certificatInfo(HttpServletRequest req, HttpServletResponse resp) throws ParseException {
 		Map<String, Object> resultMap = getResultMap();
@@ -343,7 +366,7 @@ public class CasOssViewController extends BaseController {
 				bh1.insert(0, "0");
 			}
 		}
-		if(pu.getCas_user().getAid()==null){
+		if(pu.getCas_user().getAid()==null||pu.getCas_user().getAid().equals(0L)){
 			bh = "暂未设置";
 		}else if(pu.getCas_user().getAid().equals(1L)){
            bh = "GX2"+bh1;

src/cas_v0.2.0.1/src/main/java/com/loygra/cas/mapper/postgresql/cas_user_info_mapper.xml

@@ -144,6 +144,12 @@
 		<if test="aid!=null">
 			,aid=#{aid}
 		</if>
+		<if test="exp_time!=null">
+			,exp_time=#{exp_time}
+		</if>
+		<if test="last_downloadtime!=null">
+			,last_downloadtime=#{last_downloadtime}
+		</if>
 		<if test="mid!=null">
 			,mid=#{mid}
 		</if>

src/cas_v0.2.0.1/src/main/webapp/WEB-INF/oss/cas/certificat.jsp

@@ -34,7 +34,7 @@
             text-align: center;
         }
         .content{
-            background: url(/cas/img/cas/common/bg.png);
+            background: url(/img/cas/common/bg.png);
             min-height: 700px;
             background-repeat: no-repeat;
             background-size: auto 100%;
@@ -45,7 +45,7 @@
             position: relative;
         }
         .logo{
-            background: url(/cas/img/cas/common/logo.png);
+            background: url(/img/cas/common/logo.png);
             width:60px;
             height:60px;
             background-size: auto 100%;
@@ -143,6 +143,9 @@
     // 有底部边距
     // ele:any 需要到处的dom元素 pdfName:any导出文件名称
     function downlodpdf(){
+        getAjax(localUrl + "/oss/member/downcertificat",{},function (data) {
+
+        })
         var ele = document.getElementById('zs');
         var pdfName = "证书";
         const dom = ele;

src/cas_v0.2.0.1/src/main/webapp/WEB-INF/oss/cas/member.jsp

@@ -189,6 +189,8 @@
 				{'name':'申请人','type':'value','value':'name','width':'100px'},
 				{'name':'类型','type':'category','value':'cas_user_type','width':'100px'},
 				{'name':'会员类型','type':'aid','value':'aid','width':'100px'},
+				{'name':'证书编号','type':'value','value':'bh','width':'100px'},
+				{'name':'证书最近下载','type':'time','value':'last_downloadtime','width':'100px'},
 				{'name':'申请学会','type':'value','value':'branch_name','width':'100px'},
 				{'name':'单位名称','type':'value','value':'unit','default_value':'-','width':'100px'},
 				{'name':'申请原因','type':'value','value':'apply_cause','default_value':'-','width':'100px'},

src/cas_v0.2.0.1/src/main/webapp/WEB-INF/oss/cas/member_list.jsp

@@ -200,6 +200,8 @@
 				{'name':'申请人','type':'value','value':'name','width':'100px'},
 				{'name':'类型','type':'category','value':'cas_user_type','width':'100px'},
 				{'name':'会员类型','type':'aid','value':'aid','width':'100px'},
+				{'name':'证书编号','type':'value','value':'bh','width':'100px'},
+				{'name':'证书最近下载','type':'time','value':'last_downloadtime','width':'100px'},
 				{'name':'申请学会','type':'value','value':'branch_name','width':'100px'},
 				{'name':'单位名称','type':'value','value':'unit','default_value':'-','width':'100px'},
 				{'name':'申请原因','type':'value','value':'apply_cause','default_value':'-','width':'100px'},

src/cas_v0.2.0.1/src/main/webapp/WEB-INF/oss/cas/user_apply.jsp

@@ -11,12 +11,13 @@
 <html>
 <head>
 	<%@ include  file="/WEB-INF/oss/lsp/common/variable.jsp"%>
-    <%@ include  file="/WEB-INF/oss/lsp/common/resource_lib.jsp"%>
+    <%@ include  file="/WEB-INF/oss/cas/common/resource_lib.jsp"%>
     <%@ include  file="/WEB-INF/oss/lsp/common/variable_js.jsp"%>
     <%@ include  file="/WEB-INF/oss/lsp/common/resource_layout_style.jsp"%>
     <%@ include  file="/WEB-INF/oss/cas/common/common.jsp"%>
     <link type="text/css" href="<%=basePath%>/css/cas/oss/public.css?<%=version%>" rel="stylesheet" />
-    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script> 
+    <script type="text/javascript" src="<%=basePath%>/js/cas/oss/public.js?<%=version%>"></script>
+	<script type="text/javascript" src="<%=basePath%>/js/cas/moment.min.js?<%=version%>"></script>
 	<link type="text/css" href="<%=basePath%>/css/cas/oss/user_apply.css?<%=(new Date()).getTime()%>" rel="stylesheet" />
 	<script type="text/javascript" src="<%=basePath%>/js/cas/oss/user_apply.js?<%=(new Date()).getTime()%>%>"></script>
 </head>
@@ -115,6 +116,21 @@
 					</c:if>
 				</c:if>
 				<p class="title">申请个人基本信息</p>
+				<c:if test="${cas_user.cas_user_approval_status == 202503 && cas_user.cas_user_type == 202301 && cas_user.cas_user_approval_status_manage==202503  && cas_user.lsp_user_id != user.id}">
+
+					<div style="display: flex;position: absolute;right: 10px;top:5px;align-items: center;">
+						<div>会员类型：</div><select type-name="category" id="ctype" class="lg-fession-select-style" style="width: 160px;" >
+							<option value="0">请选择</option>
+							<option value="1">学生会员</option>
+							<option value="2">普通会员</option>
+							<option value="3">高级会员</option>
+						</select>
+						<div style="margin-left: 10px">证书有效期：</div>
+						<input class="lg-fession-calendar calendar-img" type-category="date" type-name="cas_user.birthday" id="expdate"  />
+
+                        <button onclick="savecdata()" style="margin-left: 10px" class="lg-fashion-button-normal search_button">保存</button>
+					</div>
+					</c:if>
 				<c:if test="${cas_user.cas_user_approval_status == 202503 && cas_user.cas_user_type == 202301 && cas_user.cas_user_approval_status_manage==202503  && cas_user.lsp_user_id == user.id}">
 				<button class="lg-fashion-button-normal float_right margin_right perfect_info" style="position: absolute;right: 10px;top:10px" onclick="downloadc()">查看证书</button>
 				</c:if>
@@ -557,4 +573,41 @@
 </div>
 <%@ include file="/WEB-INF/oss/lsp/common/frame/bottom_file.jsp"%>
 </body>
+<script type="text/javascript">
+	function  savecdata(){
+		var ctype = $("#ctype").val();
+		var expdate = $("#expdate").val();
+		debugger
+
+		postAjax(localUrl+"/oss/member/setcertificat",{
+			"ctype":ctype,
+			"expdate":expdate,
+			"userid":${cas_user.lsp_user_id}
+		},function(data){
+			layer.msg('设置成功');
+
+		},function(error){})
+
+	}
+
+	$(function() {
+		var ctype = ${cas_user.aid==null?0:cas_user.aid};
+		var expdate = "${cas_user.exp_time}";
+
+		if(ctype!=0){
+			$("#ctype").val(ctype)
+		}
+
+
+		var d = new Date();
+		d.setMonth(11);
+		d.setUTCDate(31);
+		laydate.render({
+			elem: '#expdate',
+			format: 'yyyy-MM-dd',
+			min: 0,
+			value: expdate!=""?moment(expdate)._d:d,
+		});
+	});
+</script>
 </html>

src/cas_v0.2.0.1/src/main/webapp/js/cas/ljc_0.2.js

@@ -543,9 +543,13 @@ jQuery.fn.tableAdaptor = function (){
 		if(reg.test(params.columns[i].value)){
 			return params.columns[i].value.lgformat(obj);
 		}else{
-			val= getVal( eval(getTypeValue(params.columns[i].value,params.columns[i].type,  j 
-							,params.columns[i].name,params.columns[i].timeformat,params.columns[i])),
-								getVal(params.columns[i].default_value,""));
+			try {
+				val = getVal(eval(getTypeValue(params.columns[i].value, params.columns[i].type, j
+						, params.columns[i].name, params.columns[i].timeformat, params.columns[i])),
+					getVal(params.columns[i].default_value, ""));
+			}catch (e){
+				val="-"
+			}
 		}
 		return val;
 	}