项目列表调整：超期未上报不给上报按钮，并将上报状态改为：超期未上报

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -176,6 +176,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Integer startCount;    //开始数据
 	private Integer endingCount;   //结束数据
 	private String adventDate;   //超期时间
+	private String reportedType;   //超期状态（0：未超期；1：已超期）
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
 	private List<ProjectReportData> projectReportData = Lists.newArrayList();
@@ -765,4 +766,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setAdventDate(String adventDate) {
 		this.adventDate = adventDate;
 	}
+
+	public String getReportedType() {
+		return reportedType;
+	}
+
+	public void setReportedType(String reportedType) {
+		this.reportedType = reportedType;
+	}
 }

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

@@ -22,6 +22,7 @@ import com.jeeplus.modules.ruralprojectrecords.dao.RuralWorkProjectUserDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectReportData;
 import com.jeeplus.modules.sys.dao.WorkattachmentDao;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.entity.Workattachment;
@@ -156,6 +157,15 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             }
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }
+
+        //查询超期时间天数
+        List<MainDictDetail> adventCount = DictUtils.getMainDictListOnProjectAdvent("advent_count");
+        if(adventCount.size()>0){
+            //获取超期时间天数转int
+            Integer endingCount = Integer.parseInt(adventCount.get(0).getLabel());
+            projectRecords.setEndingCount(endingCount);
+        }
+
         int count = dao.queryCount(projectRecords);
         page.setCount(count);
         page.setCountFlag(false);
@@ -169,6 +179,10 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             records.setProjectLeaders(users);
             records.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
             records.setLeaderIds(Collections3.extractToString(users, "id", ","));
+            //判定 如果项目上报信息超期 并且没有上报则江状态改为超期未上报
+            if(records.getReportedType().equals("1") && !records.getReportedState().equals("5")){
+                records.setReportedState("6");
+            }
         }
         page.setList(recordsList);
         return page;

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -220,6 +220,7 @@
         prr.file_num as recodeNum,
 		prr.process_instance_id as prrProcessInstanceId
 		,prr.id as prrId
+		,if(date_add(prd.update_date,interval #{endingCount} day) >now(),"0","1") as reportedType
 		FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 

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

@@ -466,6 +466,7 @@ function getReportedState(id)
         case "3":result.label = "cancel";result.status="撤回";break;
         case "4":result.label = "reject";result.status="驳回";break;
         case "5":result.label = "signed";result.status="已上报";result.action = false;break;
+        case "6":result.label = "signed";result.status="超期未上报";result.action = false;break;
         default:
             result.label = "unknown";result.status="未知";break;
     }

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

@@ -391,8 +391,10 @@
                         }
 						/*上报相关按钮*/
 						if(d.projectReportRecordStatus == 5 || d.projectReportStatus == 5){
-							if(d.reportedState == 0){
-								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" + d.id + "\" style='background-color: #5FB878' onclick=\"return confirmx('确认要上报吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 上报</a>";
+							if(d.reportedType == 0){
+								if(d.reportedState == 0){
+									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" + d.id + "\" style='background-color: #5FB878' onclick=\"return confirmx('确认要上报吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 上报</a>";
+								}
 							}
 						}
                         return xml;
@@ -423,6 +425,7 @@
                     ,"procId":"${projectRecords.processInstanceId}"
                     ,"projectReportName":"${projectRecords.projectReportName}"
                     ,"reportedState":"${projectRecords.reportedState}"
+                    ,"reportedType":"${projectRecords.reportedType}"
                     ,"view":"${projectRecords.view}"
                     <c:choose>
                         <c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">