项目审核结果状态变更、项目编号变更

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

@@ -27,6 +27,7 @@ import java.util.List;
 public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 
 	public static final String SERIAL_BIZCODE ="1";
+	public static final String SERIAL_COST_BIZCODE ="1004";
 	private static final long serialVersionUID = 1L;
 	@NotNull(message = "合同信息不能为空")
 	private WorkContractInfo workContractInfo;		// 合同id

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

@@ -265,8 +265,13 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		    createBy = UserUtils.getUser();
         }
 
+		//添加项目编号
 		if(StringUtils.isBlank(projectRecords.getProjectId())){
-            projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(), RuralProjectRecords.SERIAL_BIZCODE));
+			if("1".equals(projectRecords.getProjectType())){
+				projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(), RuralProjectRecords.SERIAL_BIZCODE));
+			}else if("2".equals(projectRecords.getProjectType())) {
+				projectRecords.setProjectId(serialNumTplService.genSerialNum(createBy.getCompany(), RuralProjectRecords.SERIAL_COST_BIZCODE));
+			}
         }
         if(projectRecords.getProjectStatus()== ProjectStatusEnum.INVALID.getValue()){
             projectRecords.setId(IdGen.uuid());

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

@@ -418,6 +418,30 @@ function getAuditContractState(id)
     }
     return result;
 }
+
+
+function getruralProjectState(id)
+{
+    var result ={};
+    result.action = true;
+    switch(id)
+    {
+        case "0":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 = "discarding";result.status="作废中";break;
+        case "7":result.label = "discarded";result.status="已作废";break;
+        case "8":result.label = "changing";result.status="变更中";break;
+        case "10":result.label = "unknown";result.status="待发起";result.action = false;break;
+        default:
+            result.label = "unknown";result.status="未知";break;
+    }
+    return result;
+}
+
 function getAuditState(id)
 {
     var result ={};

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

@@ -57,7 +57,7 @@
                     return;
                 }*/
                 if(i==2){
-                    $("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectRecords/tstore");
+                    $("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectRecords/tstore");
                 }
                 $("#inputForm").submit();
                 return true;

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

@@ -299,7 +299,7 @@
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{align:'center', title: '状态',  width:70,templet:function(d){
-                        var st = getAuditState(d.projectStatus);
+                        var st = getruralProjectState(d.projectStatus);
                         if(st.action)
                             var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectRecords/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -330,7 +330,7 @@
                         <%--var st = getAuditState(d.projectStatus)--%>
                         <%--var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/projectRecords/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
                         <%--return xml;--%>
-                        var st = getAuditState(d.projectStatus);
+                        var st = getruralProjectState(d.projectStatus);
                         if(st.action)
                             var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectRecords/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         else