瀏覽代碼

项目AB级选择不同的流程

user5 4 年之前
父節點
當前提交
f1bdfc8fca

+ 19 - 1
src/main/java/com/jeeplus/modules/projectrecord/entity/ProjectRecordTreeData.java

@@ -41,7 +41,7 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     private Date date;   //时间控件
 
     private Integer projectReportStatus; //报告状态
-    private Integer projectReportStatusTwo; //报告流程2状态
+    private Integer projectReportStatusTwo; //报告签发状态
     private Integer projectReportRecordStatus; //归档状态
     private Integer downProjectReportRecordStatus; //线下归档状态
     private String reportedState;   //上报状态
@@ -82,6 +82,8 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     private Integer newRecordAuditNotifyFlag; //新归档(审批)判定条件
     private String newReportedNotifyId; //新上报代办判定条件
     private Integer newReportedNotifyFlag; //新上报(审批)判定条件
+    private String submitMoney; //项目类型
+    private String submitMoneyStr; //项目类型Str
 
 
 
@@ -644,4 +646,20 @@ public class ProjectRecordTreeData extends DataEntity<ProjectRecordTreeData> {
     public void setNewReportedNotifyFlag(Integer newReportedNotifyFlag) {
         this.newReportedNotifyFlag = newReportedNotifyFlag;
     }
+
+    public String getSubmitMoney() {
+        return submitMoney;
+    }
+
+    public void setSubmitMoney(String submitMoney) {
+        this.submitMoney = submitMoney;
+    }
+
+    public String getSubmitMoneyStr() {
+        return submitMoneyStr;
+    }
+
+    public void setSubmitMoneyStr(String submitMoneyStr) {
+        this.submitMoneyStr = submitMoneyStr;
+    }
 }

+ 2 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -602,6 +602,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         projectRecordTreeData.setNewRecordAuditNotifyFlag(info.getNewRecordAuditNotifyFlag());
         projectRecordTreeData.setNewReportedNotifyId(info.getNewReportedNotifyId());
         projectRecordTreeData.setNewReportedNotifyFlag(info.getNewReportedNotifyFlag());
+        projectRecordTreeData.setSubmitMoney(info.getSubmitMoney());
+        projectRecordTreeData.setSubmitMoneyStr(DictUtils.getMainDictLabel(info.getSubmitMoney(),"attachment_project_grade",""));
 
         return projectRecordTreeData;
     }

+ 2 - 2
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -323,8 +323,8 @@
 	<select id="findList" resultType="RuralProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumns"/>
-		,
-		a.project_type as projectType,
+		,a.submit_money as "submitMoney"
+		,a.project_type as projectType,
 		wci.name AS "workContractInfo.name",
 		wct.id AS "workContractInfo.client.id",
 		wct.name AS "workContractInfo.client.name",

文件差異過大導致無法顯示
+ 120 - 45
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageLists.jsp


文件差異過大導致無法顯示
+ 120 - 45
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists.jsp