代码优化以及调整

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -3543,8 +3543,10 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         identityService.setAuthenticatedUserId(reported.getCurrentUser().getId());
         //获取项目信息
         ProjectRecords projectRecords = projectRecordsService.getRuralMasters(reported.getProjectId());
-        String titleStr = "项目【"+projectRecords.getProjectName()+"】上报待审批";
-        String contentStr = "项目【"+projectRecords.getProjectName()+"】上报待审批，项目" + (0 == projectRecords.getOverDueStatus()?"未超期":"超期");
+        //查询报告信息
+        ProjectReportData projectReportData = projectReportDataDao.getProjectReportData(projectRecords.getId());
+        String titleStr = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】上报待审批";
+        String contentStr = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】上报待审批，项目" + (0 == projectRecords.getOverDueStatus()?"未超期":"超期");
 
         String businessKey = reported.getId();
         Office office = UserUtils.getSelectOffice();
@@ -3567,8 +3569,6 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
 
         List<User> users = new ArrayList<>();
         List<User> bmzrList = UserUtils.getByRoleActivityEnname("sbglyyjla",3,reported.getOffice().getId(),"4",reported.getCreateBy());
-        //查询报告信息
-        ProjectReportData projectReportData = projectReportDataDao.getProjectReportData(projectRecords.getId());
         //查询报告审核总审人员
         String bzshbUserId = userDao.getAuditUserListByBzshbUserId(projectReportData.getBzshbUserId());
         User zsUser = null;

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -1360,6 +1360,16 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         return workContractInfoService.get(workContractId);
     }
 
+
+    /**
+     * 根据合同id获取合同信息(上报查询使用)
+     * @param workContractId
+     * @return
+     */
+    public WorkContractInfo getProjectContractInfoByReported(String workContractId){
+        return workContractInfoService.getInfoById(workContractId);
+    }
+
     /**
      * 审核流程
      * @param reportData
@@ -3649,7 +3659,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         List<RuralReportConsultant> consultantInfoList = Lists.newArrayList();
         //查询报告信息
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectRecords.getId());
-        ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        ProjectReportData projectReportData = projectReportDataService.getProjectReportDataOnRural(projectcontentinfo1.getInfoId());
         //创建负责人信息
         RuralReportConsultant master = new RuralReportConsultant();
         for (RuralReportConsultant consultant: consultants) {

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -251,6 +251,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	}
 	public RuralProjectRecords getById(String id) {
 		RuralProjectRecords ruralProjectRecords = dao.getById(id);
+		List<User> users = workProjectUserDao.queryProjectUsers(ruralProjectRecords.getId(), "1");
+		ruralProjectRecords.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
 		ruralProjectRecords.setUploadMode(uploadMode);
 		return ruralProjectRecords;
 	}
@@ -1620,6 +1622,26 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		projectRecords.setWorkContractInfo(workContractInfo);
 	}
 
+	/**
+	 * 查询合同信息(上报使用)
+	 * @param projectRecords
+	 */
+	public void queryContractInfosByReported(RuralProjectRecords projectRecords) {
+		WorkContractInfo workContractInfo = contractInfoService.getContractInfo(projectRecords.getWorkContractInfo().getId());
+		/*if(workContractInfo!=null){
+			workContractInfo.setConstructionProjectTypeStr(DictUtils.getMainDictLabel(String.valueOf(workContractInfo.getContractType()), "contract_type", ""));
+			if(workContractInfo.getWorkClientInfoList()!=null&&!workContractInfo.getWorkClientInfoList().isEmpty()){
+				StringBuilder workClinetInfoIds = new StringBuilder();
+				for (WorkClientInfo workClientInfo : workContractInfo.getWorkClientInfoList()) {
+					workClinetInfoIds.append(workClientInfo.getId()).append(",");
+				}
+				workClinetInfoIds.deleteCharAt(workClinetInfoIds.length()-1);
+				workContractInfo.setWorkClinetInfoIds(workClinetInfoIds.toString());
+			}
+		}*/
+		projectRecords.setWorkContractInfo(workContractInfo);
+	}
+
     public RuralProjectRecords findUseableByProjectId(String projectId) {
 	    return  dao.findUseableByProjectId(projectId);
     }
@@ -1643,6 +1665,26 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
         //设置报告
         this.queryReportData(projectRecords);
     }
+
+	/**
+	 * 获取项目合同以及委托方信息（上报查询用）
+	 * @param projectRecords
+	 */
+	public void queryProjectDetailByReported(RuralProjectRecords projectRecords) {
+		if(null != projectRecords.getWorkContractInfo() && StringUtils.isNotBlank(projectRecords.getWorkContractInfo().getId())){
+			this.queryContractInfosByReported(projectRecords);
+		}
+        //设置项目组成员
+        //this.queryUserNames(projectRecords);
+        //设置项目组成员所属部门
+        //this.queryOfficeName(projectRecords);
+        //设置委托方联系人信息
+        //this.queryLinkmanInfos(projectRecords);
+        //设置附件信息
+        //this.queryWorkAttachment(projectRecords);
+        //设置报告
+        //this.queryReportData(projectRecords);
+    }
     public void queryNewProjectDetail(RuralProjectRecords projectRecords) {
 		if(null != projectRecords.getWorkContractInfo() && StringUtils.isNotBlank(projectRecords.getWorkContractInfo().getId())){
 			this.queryContractInfos(projectRecords);

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -1768,10 +1768,10 @@ public class RuralCostProjectMessageNewController extends BaseController {
         //查询上报信息表中是否含有数据，没有则进行获取基础数据
         RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
         if(reported == null){
-            RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(projectRecords.getId());
-            projectRecordsService.queryProjectDetail(records);
+            RuralProjectRecords records = projectRecordsService.getById(projectRecords.getId());
+            projectRecordsService.queryProjectDetailByReported(records);
             Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectRecords.getId());
-            ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+            ProjectReportData projectReportData = projectReportDataService.getProjectReportDataOnRural(projectcontentinfo1.getInfoId());
             records.setReportData(projectReportData);
             reported = ruralProjectMessageService.disposeData(records);
 
@@ -1814,7 +1814,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
             //对上报的咨询员进行处理
             consultantList = ruralProjectMessageS.disposereportedConsultant(reportedConsultants);
         }
-        RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(reported.getProjectId());
+        RuralProjectRecords records = projectRecordsService.getById(reported.getProjectId());
         /*if(StringUtils.isBlank(reported.getProjectRecordId())){
             reported.setProjectRecordId(records.getProjectId());
         }*/

src/main/java/com/jeeplus/modules/sys/service/UserService.java

@@ -558,10 +558,11 @@ public class UserService extends BaseController {
      * 查询总审人员信息
      * @return
      */
-    public List<User> getAuditUserList(){
-        Office recordsOffice =officeService.get(UserUtils.getUser().getOffice());
-        List<User> userList = UserUtils.getAuditUserList("bzshb",3,recordsOffice.getId(),"12",UserUtils.getUser());
-        return userList;
+    public List<User> getAuditUserList(){//查询真实总审信息
+        List<User> auditUserList = userDao.getAuditUserListByProjectGrade();
+        /*Office recordsOffice =officeService.get(UserUtils.getUser().getOffice());
+        List<User> userList = UserUtils.getAuditUserList("bzshb",3,recordsOffice.getId(),"12",UserUtils.getUser());*/
+        return auditUserList;
     }
     public List<User> getFilingUserList(){
         Office recordsOffice =officeService.get(UserUtils.getUser().getOffice());

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -248,6 +248,25 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 	 */
 	public WorkContractInfo getInfoById (String id) {
 		WorkContractInfo workContractInfo = super.get(id);
+		if(workContractInfo != null) {
+			WorkClientAttachment workClientAttachment = new WorkClientAttachment();
+			workClientAttachment.setAttachmentId(id);
+			workClientAttachment.setAttachmentFlag("44");
+			workContractInfo.setWorkAttachments(workattachmentService.getAttachmentList(workClientAttachment));
+
+			WorkContractClient workContractClient = new WorkContractClient();
+			workContractClient.setContractId(workContractInfo.getId());
+			List<WorkContractClient> list1 = workContractClientService.findList(workContractClient);
+			List<WorkClientInfo> list2 = new ArrayList<>();
+			if(list1!=null && list1.size()>0){
+				for(WorkContractClient w :list1){
+					WorkClientInfo workClientInfo = workClientInfoService.getById(w.getClientId());
+					list2.add(workClientInfo);
+				}
+				workContractInfo.setWorkClientInfoList(list2);
+			}
+
+		}
 		return workContractInfo;
 	}
 

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2562,7 +2562,7 @@ public class WorkProjectNotifyController extends BaseController {
 					projectcontentinfo.setProjectReportData(projectReportData);
 
 					//获取项目信息
-					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.getQueryProjectUsers(projectReportData.getProject().getId());
+					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.getById(projectReportData.getProject().getId());
 					//获取复核标准
 					String reviewId="";
 					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
@@ -2582,7 +2582,7 @@ public class WorkProjectNotifyController extends BaseController {
 					//获取合同信息
 					WorkContractInfo workContractInfo=this.queryWorkContract(ruralProjectRecords.getId());
 					if(null != workContractInfo){
-						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+						WorkClientInfo clientInfo = workClientInfoService.getById(workContractInfo.getClient().getId());
 						model.addAttribute("workClientInfo", clientInfo);
 						if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
 							//收费标准
@@ -2600,7 +2600,7 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 
 
-					WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfo(ruralProjectRecords.getWorkContractInfo().getId());
+					WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfoByReported(ruralProjectRecords.getWorkContractInfo().getId());
 					ruralProjectRecords.setWorkContractInfo(projectContractInfo);
 					MyBeanUtils.copyBeanNotNull2Bean(ruralProjectRecords,projectReportData.getProject());//将编辑表单中的非NULL值覆盖数据库记录中的值
 					if(null != projectContractInfo){
@@ -2643,10 +2643,6 @@ public class WorkProjectNotifyController extends BaseController {
 					requiredStageList.add(2);
 					relateInfo.setRequiredStageList(requiredStageList);
 					relateInfo.setId(ruralProjectRecords.getId());
-					//查询报告文件、依据性文件、其他文件必填列表以及数据
-					List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
-					//文件处理
-					projectTemplateService.disposeProjectTemplateFile(mainDictDetails,relateInfo,engineeringId,ruralProjectRecords,projectcontentinfo,"");
 					/*for (MainDictDetail mainDict : mainDictDetails) {
 						relateInfo.setAttachType(mainDict.getValue());
 						switch (mainDict.getValue()) {
@@ -2703,7 +2699,7 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 
 					//获取项目基础信息
-					ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
+					ruralProjectRecordsService.queryProjectDetailByReported(ruralProjectRecords);
 					//工程咨询
 					List<MainDictDetail> mainDictList = Lists.newArrayList();
 					if("1".equals(ruralProjectRecords.getProjectType())){
@@ -2799,7 +2795,7 @@ public class WorkProjectNotifyController extends BaseController {
 					}else{
 						reported.setHome("home");
 					}
-					RuralProjectRecords records = ruralProjectRecordsService.getQueryProjectUsers(reported.getProjectId());
+					RuralProjectRecords records = ruralProjectRecordsService.getById(reported.getProjectId());
 					//根据上报id查询上报咨询员的信息
 					List<RuralReportConsultant> reportedConsultants=ruralProjectMessageService.getReportedConsultantsList(reported.getId());
 					//对上报的咨询员进行处理
@@ -2829,6 +2825,12 @@ public class WorkProjectNotifyController extends BaseController {
 						model.addAttribute("identificationName","项目上报审核意见");
 						if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
 							if(Double.valueOf(reported.getJingHeJianLv())>30 || Double.valueOf(reported.getJingHeJianLv())< -30 ){
+
+								//查询报告文件、依据性文件、其他文件必填列表以及数据
+								List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+								//文件处理
+								projectTemplateService.disposeProjectTemplateFile(mainDictDetails,relateInfo,engineeringId,ruralProjectRecords,projectcontentinfo,"");
+
 								projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
 								projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
 								projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
@@ -2838,6 +2840,11 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 						return "modules/ruralprojectrecords/cost/newReported/reportedAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+						//查询报告文件、依据性文件、其他文件必填列表以及数据
+						List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+						//文件处理
+						projectTemplateService.disposeProjectTemplateFile(mainDictDetails,relateInfo,engineeringId,ruralProjectRecords,projectcontentinfo,"");
+
 						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
 						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
 						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
@@ -8668,7 +8675,7 @@ public class WorkProjectNotifyController extends BaseController {
 			projectRecords = ruralProjectRecordsService.get(projectId);
 		}
 		//获取合同信息
-		WorkContractInfo workContractInfo = workContractInfoService.get(projectRecords.getWorkContractInfo().getId());
+		WorkContractInfo workContractInfo = workContractInfoService.getInfoById(projectRecords.getWorkContractInfo().getId());
 		return workContractInfo;
 	}
 	/**

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementNewService.java

@@ -251,6 +251,11 @@ public class WorkReimbursementNewService extends CrudService<WorkReimbursementDa
             bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,"7f776d072d7b4c839cef4e63ce6dbfa5","8",workReimbursement.getCreateBy());
         }
 
+        //判断当前登陆人的部门是否为综合管理部。如果是，则审核人设置为总审室部门主任（王年生）
+        if("6c9ca86e941b4a738c1ab9b006976264".equals(office.getId())){
+            bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,"26f5f4aff4244d8c833cca11f305c612","8",workReimbursement.getCreateBy());
+        }
+
 
         //分管领导
         //List<User> fglds = UserUtils.getByRoleActivityEnname("fgld",2,office.getId(),"8",workReimbursement.getCreateBy());

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -390,6 +390,10 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
         if("7f776d072d7b4c839cef4e63ce6dbfa5".equals(office.getId()) || office.getParentIds().contains("7f776d072d7b4c839cef4e63ce6dbfa5")){
             bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,"7f776d072d7b4c839cef4e63ce6dbfa5","8",workReimbursement.getCreateBy());
         }
+        //判断当前登陆人的部门是否为综合管理部。如果是，则审核人设置为总审室部门主任（王年生）
+        if("6c9ca86e941b4a738c1ab9b006976264".equals(office.getId())){
+            bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,"26f5f4aff4244d8c833cca11f305c612","8",workReimbursement.getCreateBy());
+        }
 
 
         //分管领导
@@ -773,7 +777,15 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
         String enname = "";
         List<Activity> activitieList = activityService.getByProcessInstanceId(workReimbursement.getProcessInstanceId());
         WorkActivityMenu workActivityMenu = new WorkActivityMenu();
+
         if (activitieList != null && activitieList.size() != 0) {
+            Iterator<Activity> iterator = activitieList.iterator();
+            while (iterator.hasNext()){
+                Activity activityInfo = iterator.next();
+                if (!"newReimbursement".equals(activityInfo.getProcessKey())){
+                    iterator.remove();
+                }
+            }
             workActivityMenu.setProcessType(activitieList.get(0).getProcessKey());
             workActivityMenu.setActivities(activitieList);
         }

src/main/webapp/static/common/jeeplus.js

@@ -602,6 +602,30 @@ function getReportIssueState(id)
     return result;
 }
 
+function getReportIssueStateB(id)
+{
+    var result ={};
+    result.action = true;
+    switch(id)
+    {
+        case "0":result.label = "";result.status="";result.action = false;break;
+        case "1":result.label = "tempstore";result.status="暂存";result.action = false;break;
+        case "2":result.label = "auditing";result.status="审批中";break;
+        case "3":result.label = "cancel";result.status="撤回";break;
+        case "4":result.label = "reject";result.status="驳回";break;
+        case "5":result.label = "signed";result.status="已完成";break;
+        case "6":result.label = "tempstore";result.status="超期未复核";result.action = false;break;
+        case "7":result.label = "signed";result.status="超期复核";break;
+        case "9":result.label = "reject";result.status="作废驳回";break;
+        case "8":result.label = "changing";result.status="变更中";break;
+        case "10":result.label = "signed";result.status="无复核";result.action = false;break;
+        case "11":result.label = "cancel";result.status="作废撤回";break;
+        default:
+            result.label = "unknown";result.status="未知";break;
+    }
+    return result;
+}
+
 function getBusinessQuestionsAuditState(id)
 {
     var result ={};

src/main/webapp/webpage/include/head.jsp

@@ -36,7 +36,7 @@
 
 <!-- jeeplus -->
 <link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/common/jeeplus.js?10" type="text/javascript"></script>
+<script src="${ctxStatic}/common/jeeplus.js?11" type="text/javascript"></script>
 <script type="text/javascript" src="${ctxStatic}/common/openShow.js"></script>
 
 <!-- jquery ui -->

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -1399,7 +1399,12 @@
                         return xml;
                     }}
 				,{align:'center', title: '报告签发'+ helpShowDetail('bz-0004'),  width:105,templet:function(d){
-						var st = getReportIssueState(""+d.projectReportStatusTwo);
+						var st = false;
+						if (d.submitMoney=="1"){
+							st = getReportIssueStateB(""+d.projectReportStatusTwo);
+						}else if (d.submitMoney=="2"){
+							st = getReportIssueState(""+d.projectReportStatusTwo);
+						}
 						if(st.action)
 							var xml = "<span onclick=\"openDialogReportTwoView('流程追踪', '${ctx}/ruralProject/ruralProjectMessageNewTwo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						else

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -1032,8 +1032,12 @@
                         return xml;
                     }}
 				,{align:'center', title: '报告签发'+ helpShowDetail('bz-0004'),  width:105,templet:function(d){
-						var st = getReportIssueState(""+d.projectReportStatusTwo);
-
+						var st = false;
+						if (d.submitMoney=="1"){
+							st = getReportIssueStateB(""+d.projectReportStatusTwo);
+						}else if (d.submitMoney=="2"){
+							st = getReportIssueState(""+d.projectReportStatusTwo);
+						}
 						if(st.action){
 							if (d.submitMoney=="1"){
 								var xml = "<span title='报告签发时间："+ d.reportTwoAuditDate +"' class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -967,11 +967,16 @@
                         return xml;
                     }}
 				,{align:'center', title: '报告签发'+ helpShowDetail('bz-0004'),  width:105,templet:function(d){
-						var st = getReportIssueState(""+d.projectReportStatusTwo);
+						var st = false;
+						if (d.submitMoney=="1"){
+							st = getReportIssueStateB(""+d.projectReportStatusTwo);
+						}else if (d.submitMoney=="2"){
+							st = getReportIssueState(""+d.projectReportStatusTwo);
+						}
 						if(st.action)
-							var xml = "<span onclick=\"openDialogReportTwoView('流程追踪', '${ctx}/ruralProject/ruralProjectMessageNewTwo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span onclick=\"openDialogReportTwoView('流程追踪', '${ctx}/ruralProject/ruralProjectMessageNewTwo/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						else
-							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
                 ,{align:'left', title: '电子/超期天数'+ helpShowDetail('bz-0001'),  width:170,templet:function(d){

src/main/webapp/webpage/modules/sys/sysLogin.jsp

@@ -18,7 +18,7 @@
 	<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 	<!-- jeeplus -->
 	<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-	<script src="${ctxStatic}/common/jeeplus.js?10" type="text/javascript"></script>
+	<script src="${ctxStatic}/common/jeeplus.js?11" type="text/javascript"></script>
 	<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 	<!-- text fonts -->
 	<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />

src/main/webapp/webpage/modules/sys/sysLogin2.jsp

@@ -16,7 +16,7 @@
 		<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 		<!-- jeeplus -->
 		<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-		<script src="${ctxStatic}/common/jeeplus.js?10" type="text/javascript"></script>
+		<script src="${ctxStatic}/common/jeeplus.js?11" type="text/javascript"></script>
 		<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 		<!-- text fonts -->
 		<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />