浏览代码

报告质量复核代码调整

徐滕 7 小时之前
父节点
当前提交
1688a0c588

+ 11 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -6563,6 +6563,17 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	public void getJudgeAdvanceWeekNotice() {
 		List<RuralProjectRecords> judgeAdvanceWeekNotice = dao.findJudgeAdvanceWeekNotice();
 		for (RuralProjectRecords info : judgeAdvanceWeekNotice) {
+			//暂时判定条件
+			if(info.getProjectReportNumber().equals("苏兴造字【2026】0916") || info.getProjectReportNumber().equals("苏兴造字【2026】0652")){
+				//判断当前年份 ≤ 2026
+				java.util.Calendar cal = java.util.Calendar.getInstance();
+				int currentYear = cal.get(java.util.Calendar.YEAR);
+
+				if (currentYear <= 2026) {
+					// 当前时间在2026年之内
+					continue;
+				}
+			}
 			//判定 若项目类别为 数字化项目审核 则不进行考核
 			if("10".equals(info.getAttachmentProjectSort()) && "2".equals(info.getProjectType())){
 				continue;

+ 1 - 0
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -5290,6 +5290,7 @@
 		SELECT <include refid="projectRecordsColumns"/>,
 		datediff( now(), prd.create_date) "adventDate",a.project_type as "projectType"
 		,ifnull(prd.status,0) as "projectReportStatus"
+		,ifnull(prd.number,"") as "projectReportNumber"
 		FROM rural_project_records a
 		left join work_contract_info wci on a.contract_id = wci.id
 		left join project_report_data prd on prd.project_id = a.id

+ 3 - 3
src/main/webapp/webpage/modules/sys/userInfo.jsp

@@ -576,7 +576,7 @@
                     <div class="col-sm-12" style="padding: 0;">
                         <div class="ibox float-e-margins">
                             <div class="ibox-title">
-                                <h2 style="text-indent: 12px;margin-top: 10px;font-size: 16px;font-weight: bold;border-left: 5px solid #009FFA;">基本信息 <span style="color:#888888; font-size:12px; font-weight:normal;">  (基本信息修改审核人:杨娟;职业资格证修改审核人:韩丽、刘芸)</span></h2>
+                                <h2 style="text-indent: 12px;margin-top: 10px;font-size: 16px;font-weight: bold;border-left: 5px solid #009FFA;">基本信息 <span style="color:#888888; font-size:12px; font-weight:normal;">  (基本信息修改审核人:杨娟)</span></h2>
 
                                 <div class="ibox-tools" style="margin-top: -20px">
                                     <a style="display:block;" class="dropdown-toggle" data-toggle="dropdown"
@@ -591,9 +591,9 @@
                                             <li>
                                                 <a id="userEdit" data-toggle="modal" onclick="openDialog('修改档案信息', '${ctx}/workstaff/workStaffBasicInfo/applyEdit','95%','95%')" data-target="#register">申请修改</a>
                                             </li>
-                                            <li>
+                                            <%--<li>
                                                 <a id="userEditDirectly" data-toggle="modal" onclick="openDialogCertificate('修改执业资格证信息', '${ctx}/workstaff/workStaffBasicInfo/applyCertificateEdit','95%','95%')" data-target="#register">执业资格证修改</a>
-                                            </li>
+                                            </li>--%>
                                         </c:if>
                                         <c:if test="${workStaffBasicInfo.auditStatus == '2'}">
                                             <li>