上报添加超期字段，超期未上报审批完成变更为超期上报

src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecords.java

@@ -98,6 +98,7 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	private Office office;
 	private Integer projectStatus;//项目状态
 	private String reportedState;   //上报状态
+	private Integer overDueStatus; //超期状态（0：未超期，1：已超期）
 
 	private String auditType;
 
@@ -710,4 +711,12 @@ public class ProjectRecords extends ActEntity<ProjectRecords> {
 	public void setReportedState(String reportedState) {
 		this.reportedState = reportedState;
 	}
+
+	public Integer getOverDueStatus() {
+		return overDueStatus;
+	}
+
+	public void setOverDueStatus(Integer overDueStatus) {
+		this.overDueStatus = overDueStatus;
+	}
 }

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

@@ -84,6 +84,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String view;
 	private List<ProjectPlanInfo> projectPlanList= Lists.newArrayList();;//项目计划信息
 	private List<ReportedConsultant> reportedConsultantList= Lists.newArrayList();;//咨询员列表
+	private Integer overDueStatus; //超期状态（0：未超期，1：已超期）
 
 	public String getPrrId() {
 		return prrId;
@@ -875,4 +876,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setReportedProcessInstanceId(String reportedProcessInstanceId) {
 		this.reportedProcessInstanceId = reportedProcessInstanceId;
 	}
+
+	public Integer getOverDueStatus() {
+		return overDueStatus;
+	}
+
+	public void setOverDueStatus(Integer overDueStatus) {
+		this.overDueStatus = overDueStatus;
+	}
 }

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

@@ -125,6 +125,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
     private WorkContractInfoService workContractInfoService;
     @Autowired
     private RuralProjectRecordsReportedDao ruralProjectRecordsReportedDao;
+    @Autowired
+    private RuralProjectRecordsService ruralProjectRecordsService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -2068,8 +2070,16 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 if ("yes".equals(reported.getAct().getFlag())) {
                     //修改项目上报表中状态
                     reported.setReportStatus(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
+                    //获取项目信息
+                    RuralProjectRecords record = ruralProjectRecordsService.get(records);
+
                     //修改项目表中上报状态
-                    records.setReportedState(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
+                    //判断项目是否超期，如果超期则将上报标志改为超期上报（7） 否则变更为正常上报数据
+                    if(1 == record.getOverDueStatus()){
+                        records.setReportedState("7");
+                    }else{
+                        records.setReportedState(String.valueOf(ProjectStatusEnum.SIGNED.getValue()));
+                    }
                     WorkProjectNotify notify = new WorkProjectNotify();
                     notify.setNotifyId(reported.getId());
                     userList = workProjectNotifyService.readByNotifyId(notify);

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

@@ -1351,7 +1351,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			projectRecords.setStartCount(endingCount-3);
 			projectRecords.setEndingCount(endingCount);
 		}
-		//获取项目数据
+		//获取项目数据（提前三天进行通知 即 获取即将超期的数据）
 		List<RuralProjectRecords> projectRecordsList = dao.getProjectReportedListByAdvent(projectRecords);
 		for (RuralProjectRecords info: projectRecordsList) {
 			String notifyStr = "项目编号："+info.getProjectId()+"，项目名称："+ info.getProjectName();
@@ -1371,7 +1371,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			}
 
 		}
-		//获取项目数据
+		//获取项目数据（获取已经超期的项目数据，进行修改超期状态）
 		List<RuralProjectRecords> projectNotReportList = dao.getProjectNotReportList(projectRecords);
 		List<String> idList = Lists.newArrayList();
 		if(projectNotReportList.size()>0) {

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

@@ -43,7 +43,8 @@
 		a.building_unit_fees AS "buildingUnitFees",
 		a.install_unit_fees AS "installUnitFees",
 		a.total_fees AS "totalFees",
-		ifnull(a.reported_state,0) as "reportedState"
+		ifnull(a.reported_state,0) as "reportedState",
+		a.over_due_status as "overDueStatus"
 	</sql>
 
 	<sql id="projectReportDataColumns">

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

@@ -47,7 +47,8 @@
 		a.estimate_total_fees AS "estimateTotalFees",
 		a.construction_unit as "constructionUnit",
 		a.construction_linkman as "constructionLinkman",
-		a.project_type as "projectType"
+		a.project_type as "projectType",
+		a.over_due_status as "overDueStatus"
 	</sql>
 	
 	<sql id="projectRecordsJoins">
@@ -1128,7 +1129,8 @@
 
 	<update id="updateProjectReportedState">
 		update rural_project_records set
-		reported_state = '6'
+		reported_state = '6',
+		over_due_status = 1
 		where id in
 		<foreach item="item" index="index" collection="idList"
 				 open="(" separator="," close=")">

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

@@ -133,6 +133,7 @@
                 var days = Math.floor(a / (24 * 3600 * 1000));
                 if(days >37){
                     parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
+                    return false;
                 }
                 $("#inputForm").submit();
                 return true;
@@ -582,18 +583,6 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
-                    <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
-                    <div class="layui-input-block">
-                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
                     <div class="layui-input-block">
                         <form:select path="TouZiXZ" class="form-control layui-input required simple-select">
@@ -624,6 +613,18 @@
                                                 labelValue="${ruralProjectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
+                    <div class="layui-input-block">
+                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
+                    </div>
+                </div>
                 <%--<div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block">

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

@@ -133,6 +133,7 @@
                 var days = Math.floor(a / (24 * 3600 * 1000));
                 if(days >37){
                     parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
+                    return false;
                 }
                 $("#inputForm").submit();
                 return true;
@@ -604,18 +605,6 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
-                    <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
-                    <div class="layui-input-block">
-                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
                     <div class="layui-input-block">
                         <form:select path="TouZiXZ" class="form-control layui-input required simple-select">
@@ -647,6 +636,18 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
+                    <div class="layui-input-block">
+                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>项目报告号：</label>
                     <div class="layui-input-block">
                         <form:input path="DangABH" htmlEscape="false"  class="form-control layui-input required"/>

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

@@ -134,8 +134,9 @@
                     var nowDate = new Date();
                     var a = nowDate - baogaoDate;
                     var days = Math.floor(a / (24 * 3600 * 1000));
-                    if(days >37){
+                    if(days >40){
                         parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
+                        return false;
                     }
                 }else{
                     $('#flag').val('no');
@@ -610,18 +611,6 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
-                    <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
-                    <div class="layui-input-block">
-                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
                     <div class="layui-input-block">
                         <form:select path="TouZiXZ" class="form-control layui-input required simple-select">
@@ -653,6 +642,18 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
+                    <div class="layui-input-block">
+                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>项目报告号：</label>
                     <div class="layui-input-block">
                         <form:input path="DangABH" htmlEscape="false"  class="form-control layui-input required"/>

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

@@ -133,6 +133,7 @@
                 var days = Math.floor(a / (24 * 3600 * 1000));
                 if(days >37){
                     parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
+                    return false;
                 }
 
                 $("#inputForm").submit();
@@ -598,18 +599,6 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
-                    <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
-                    <div class="layui-input-block">
-                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
                     <div class="layui-input-block">
                         <form:select path="TouZiXZ" class="form-control layui-input required simple-select">
@@ -640,6 +629,18 @@
                                                 labelValue="${ruralProjectRecordsReported.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
+                    <div class="layui-input-block">
+                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
+                    </div>
+                </div>
                 <%--<div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
                     <div class="layui-input-block">

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

@@ -133,6 +133,7 @@
                 var days = Math.floor(a / (24 * 3600 * 1000));
                 if(days >37){
                     parent.layer.msg("出具报告日期超期，请重新选择!", {icon: 5});
+                    return false;
                 }
                 $("#inputForm").submit();
                 return true;
@@ -603,18 +604,6 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
-                    <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
-                    <div class="layui-input-block">
-                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label"><span class="require-item">*</span>投资性质：</label>
                     <div class="layui-input-block">
                         <form:select path="TouZiXZ" class="form-control layui-input required simple-select">
@@ -646,6 +635,18 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label"><span class="require-item">*</span>委托单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="WeiTuoDW" htmlEscape="false"  class="form-control layui-input required"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>委托单位电话：</label>
+                    <div class="layui-input-block">
+                        <form:input path="LianXiDH" htmlEscape="false"  class="form-control layui-input required"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>项目报告号：</label>
                     <div class="layui-input-block">
                         <form:input path="DangABH" htmlEscape="false"  class="form-control layui-input required"/>

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

@@ -107,18 +107,6 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label">委托单位：</label>
-                    <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" htmlEscape="false" readonly="true" class="form-control layui-input required" style="background-color: #ffffff;"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
-                    <label class="layui-form-label double-line">委托单位电话：</label>
-                    <div class="layui-input-block">
-                        <form:input path="LianXiDH" htmlEscape="false" readonly="true"  class="form-control layui-input required" style="background-color: #ffffff;"/>
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">投资性质：</label>
                     <div class="layui-input-block">
                         <form:input path="TouZiXZ" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
@@ -143,6 +131,18 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">委托单位：</label>
+                    <div class="layui-input-block">
+                        <form:input path="WeiTuoDW" htmlEscape="false" readonly="true" class="form-control layui-input required" style="background-color: #ffffff;"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label double-line">委托单位电话：</label>
+                    <div class="layui-input-block">
+                        <form:input path="LianXiDH" htmlEscape="false" readonly="true"  class="form-control layui-input required" style="background-color: #ffffff;"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">项目报告号：</label>
                     <div class="layui-input-block">
                         <form:input path="DangABH" htmlEscape="false" readonly="true" class="form-control layui-input required" style="background-color: #ffffff;"/>