功能

src/main/java/com/spk/zyse/meeting/entity/AcademicMeeting.java

@@ -102,7 +102,13 @@ public class AcademicMeeting extends BaseEntity{
 	
     //最后修改时间
 
-    private Date updateTime ;
+    private Date updateTime;
+    
+    //使用经费
+    private String useFunds;
+    
+    //经费金额
+    private String amountFunds;
 	
     public AcademicMeeting()
     {
@@ -379,4 +385,20 @@ public class AcademicMeeting extends BaseEntity{
 		this.deptId = deptId;
 	}
 
+	public String getUseFunds() {
+		return useFunds;
+	}
+
+	public void setUseFunds(String useFunds) {
+		this.useFunds = useFunds;
+	}
+
+	public String getAmountFunds() {
+		return amountFunds;
+	}
+
+	public void setAmountFunds(String amountFunds) {
+		this.amountFunds = amountFunds;
+	}
+
 }

src/main/java/com/spk/zyse/result/entity/ResultPaper.java

@@ -157,6 +157,15 @@ public class ResultPaper extends BaseEntity{
 
     private String userId ;
     
+    //基金标准
+    private String fundStandard ;
+    
+    //基金号
+    private String fundNo ;
+    
+    //基金类型
+    @Dict(type="fund_type")
+    private String fundType ;
     
     private Long belongDept;
 	
@@ -615,4 +624,28 @@ public class ResultPaper extends BaseEntity{
 		this.periodicalLevel = periodicalLevel;
 	}
 
+	public String getFundStandard() {
+		return fundStandard;
+	}
+
+	public void setFundStandard(String fundStandard) {
+		this.fundStandard = fundStandard;
+	}
+
+	public String getFundNo() {
+		return fundNo;
+	}
+
+	public void setFundNo(String fundNo) {
+		this.fundNo = fundNo;
+	}
+
+	public String getFundType() {
+		return fundType;
+	}
+
+	public void setFundType(String fundType) {
+		this.fundType = fundType;
+	}
+	
 }

src/main/resources/application.properties

 #默认数据库配置
-#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/zy_se?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
-#spring.datasource.username=root
-#spring.datasource.password=123456
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-
-#默认数据库配置
-spring.datasource.url=jdbc:mysql://39.98.208.200:3388/syzy_se?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/syzy_se?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=haosqlenterprise1604spk.0
+spring.datasource.password=root
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
+#默认数据库配置
+#spring.datasource.url=jdbc:mysql://39.98.208.200:3388/syzy_se?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
+#spring.datasource.username=root
+#spring.datasource.password=haosqlenterprise1604spk.0
+#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
 
 spring.mail.host=smtphz.qiye.163.com
 spring.mail.username=xitongyoujian@bjzhongyi.com

src/main/resources/sql/key/keyDisciplinesPersonnel.md

@@ -8,8 +8,7 @@ queryByCondition
     @}
     from key_disciplines_personnel t
     where 1=1 
-    @//数据权限，该sql语句功能点  
-    and #function("keyDisciplinesPersonnel.query")#
+  
     
     
     

src/main/resources/static/js/key/keyDisciplinesPersonnel/index.js

@@ -44,6 +44,13 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
 
                     field : 'birthday', 
                         title : '出生日期',
+                       templet:function(d){
+                		if(d.birthday!=null && d.birthday!=""){
+	            			return d.birthday.substring(0,10)
+	            		}else{
+	            			return "";
+	            		}
+                	}
                 },
                 {
 

src/main/resources/static/js/key/keyDisciplinesPersonnel/indexKemi.js

@@ -44,6 +44,13 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
 
                     field : 'birthday', 
                         title : '出生日期',
+                        templet:function(d){
+                		if(d.birthday!=null && d.birthday!=""){
+	            			return d.birthday.substring(0,10)
+	            		}else{
+	            			return "";
+	            		}
+                	}    
                 },
                 {
 

src/main/resources/templates/meeting/academicMeeting/add.html

@@ -143,6 +143,22 @@
             </div>
         </div>
         
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">使用经费</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect style='layui-input-inline' type="use_funds" layFilter="useFunds" id="useFunds" name="useFunds" />
+				
+				</div>
+            </div>
+           <div class="layui-inline">
+            <label class="layui-form-label label-size">经费金额</label>
+				<div class="layui-input-inline">
+					<input type="text" name="amountFunds" class="layui-input" >
+				</div>
+            </div>
+        </div>
+        
         <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
   			<legend>活动照片</legend>
 		</fieldset>	

src/main/resources/templates/meeting/academicMeeting/edit.html

@@ -152,6 +152,22 @@
             </div>
         </div>
         
+        <div class="layui-form-item">
+            <div class="layui-inline">
+            <label class="layui-form-label label-size">使用经费</label>
+				<div class="layui-input-inline">
+					<layui:simpleDictSelect style='layui-input-inline' type="use_funds" layFilter="useFunds" id="useFunds" name="useFunds"  value="${academicMeeting.useFunds}"/>
+				
+				</div>
+            </div>
+           <div class="layui-inline">
+            <label class="layui-form-label label-size">经费金额</label>
+				<div class="layui-input-inline">
+					<input type="text" name="amountFunds" class="layui-input" value="${academicMeeting.amountFunds}">
+				</div>
+            </div>
+        </div>
+        
         <!--#if(isNotEmpty(returnReason)){  -->
         <div class="layui-form-item">
         	<div class="layui-inline">

src/main/resources/templates/result/resultPaper/add.html

@@ -217,7 +217,7 @@
 		</div>
 
 		<div class="layui-form-item">
-			<div class="layui-inline">
+
 				<div class="layui-inline">
 					<label class="layui-form-label label-size">所属学科:</label>
 					<div class="layui-input-inline">
@@ -225,7 +225,28 @@
 						<input type="hidden" name="inSubject" class="layui-input">
 					</div>
 				</div>
+				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金标准:</label>
+					<div class="layui-input-inline">
+						<input type="text" id="fundStandard" name="fundStandard"  class="layui-input"> 
+					</div>
 				</div>
+		</div>
+		<div class="layui-form-item">
+				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金号:</label>
+					<div class="layui-input-inline">
+						<input type="text" id="fundNo" name="fundNo"  class="layui-input"> 
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金类型:</label>
+					<div class="layui-input-inline">
+					    <layui:simpleDictSelect name="fundType" type="fund_type" layVerify="required" />
+					</div>
+				</div>
+		</div>
+		<div class="layui-form-item">
 		    <div class="layui-inline">
 				<label class="layui-form-label label-size">备注</label>
 				<div class="layui-input-inline">

src/main/resources/templates/result/resultPaper/addEnglish.html

@@ -212,6 +212,29 @@
 					</div>
 				</div>
 				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金标准:</label>
+					<div class="layui-input-inline">
+						<input type="text" id="fundStandard" name="fundStandard"  class="layui-input"> 
+					</div>
+				</div>
+        </div>
+        <div class="layui-form-item">
+				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金号:</label>
+					<div class="layui-input-inline">
+						<input type="text" id="fundNo" name="fundNo"  class="layui-input"> 
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金类型:</label>
+					<div class="layui-input-inline">
+					    <layui:simpleDictSelect name="fundType" type="fund_type" layVerify="required" />
+					</div>
+				</div>
+			
+		</div>
+		<div class="layui-form-item">
+		    <div class="layui-inline">
 				<label class="layui-form-label label-size">备注</label>
 				<div class="layui-input-inline">
 					<input type="text" name="remark" class="layui-input">

src/main/resources/templates/result/resultPaper/edit.html

@@ -230,6 +230,33 @@
 				</div>
             </div>
             <div class="layui-inline">
+            <label class="layui-form-label label-size">基金标准</label>
+				<div class="layui-input-inline">
+					<input type="text" name="fundStandard" class="layui-input" value="${resultPaper.fundStandard}">
+				</div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金号</label>
+					<div class="layui-input-inline">
+						<input type="text" id="fundNo" name="fundNo"  class="layui-input" value="${resultPaper.fundNo}"> 
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金类型</label>
+					<div class="layui-input-inline">
+					    <!--#if(isNotEmpty(status)){  -->
+					       <input type="text" name="fundType" lay-verify="required" class="layui-input" value="${resultPaper.fundTypeText}" >
+					    <!--#}else{  -->
+					       <layui:simpleDictSelect name="fundType" type="fund_type" layVerify="required" value="${resultPaper.fundType}" />
+					    <!--#}  -->
+					</div>
+				</div>
+			
+		</div>
+		<div class="layui-form-item">
+		    <div class="layui-inline">
 				<label class="layui-form-label label-size">备注</label>
 				<div class="layui-input-inline">
 					<input type="text" name="remark" class="layui-input" value="${resultPaper.remark}">

src/main/resources/templates/result/resultPaper/editEnglish.html

@@ -278,6 +278,34 @@
 				</div>
             </div>
             <div class="layui-inline">
+            <label class="layui-form-label label-size">基金标准</label>
+				<div class="layui-input-inline">
+					<input type="text" name="fundStandard" class="layui-input" value="${resultPaper.fundStandard}">
+				</div>
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金号</label>
+					<div class="layui-input-inline">
+						<input type="text" id="fundNo" name="fundNo"  class="layui-input" value="${resultPaper.fundNo}"> 
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金类型</label>
+					<div class="layui-input-inline">
+					    <!--#if(isNotEmpty(status)){  -->
+					       <input type="text" name="fundType" lay-verify="required" class="layui-input" value="${resultPaper.fundTypeText}" >
+					    <!--#}else{  -->
+					       <layui:simpleDictSelect name="fundType" type="fund_type" layVerify="required" value="${resultPaper.fundType}" />
+					    <!--#}  -->
+					</div>
+				</div>
+			
+		</div>
+		<div class="layui-form-item">
+		    <div class="layui-inline">
 				<label class="layui-form-label label-size">备注</label>
 				<div class="layui-input-inline">
 					<input type="text" name="remark" class="layui-input" value="${resultPaper.remark}">

src/main/resources/templates/result/resultPaper/passEdit.html

@@ -232,6 +232,34 @@
 				</div>
             </div>
             <div class="layui-inline">
+            <label class="layui-form-label label-size">基金标准</label>
+				<div class="layui-input-inline">
+					<input type="text" name="fundStandard" class="layui-input" value="${resultPaper.fundStandard}">
+				</div>
+            </div>
+        </div>
+        
+         <div class="layui-form-item">
+				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金号</label>
+					<div class="layui-input-inline">
+						<input type="text" id="fundNo" name="fundNo"  class="layui-input" value="${resultPaper.fundNo}"> 
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金类型</label>
+					<div class="layui-input-inline">
+					    <!--#if(isNotEmpty(status)){  -->
+					       <input type="text" name="fundType" lay-verify="required" class="layui-input" value="${resultPaper.fundTypeText}" >
+					    <!--#}else{  -->
+					       <layui:simpleDictSelect name="fundType" type="fund_type" layVerify="required" value="${resultPaper.fundType}" />
+					    <!--#}  -->
+					</div>
+				</div>
+			
+		</div>
+		<div class="layui-form-item">
+		    <div class="layui-inline">
 				<label class="layui-form-label label-size">备注</label>
 				<div class="layui-input-inline">
 					<input type="text" name="remark" class="layui-input" value="${resultPaper.remark}">

src/main/resources/templates/result/resultPaper/passEditEnglish.html

@@ -270,6 +270,34 @@
 				</div>
             </div>
             <div class="layui-inline">
+            <label class="layui-form-label label-size">基金标准</label>
+				<div class="layui-input-inline">
+					<input type="text" name="fundStandard" class="layui-input" value="${resultPaper.fundStandard}">
+				</div>
+            </div>
+        </div>
+        
+        <div class="layui-form-item">
+				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金号</label>
+					<div class="layui-input-inline">
+						<input type="text" id="fundNo" name="fundNo"  class="layui-input" value="${resultPaper.fundNo}"> 
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label class="layui-form-label label-size">基金类型</label>
+					<div class="layui-input-inline">
+					    <!--#if(isNotEmpty(status)){  -->
+					       <input type="text" name="fundType" lay-verify="required" class="layui-input" value="${resultPaper.fundTypeText}" >
+					    <!--#}else{  -->
+					       <layui:simpleDictSelect name="fundType" type="fund_type" layVerify="required" value="${resultPaper.fundType}" />
+					    <!--#}  -->
+					</div>
+				</div>
+			
+		</div>
+		<div class="layui-form-item">
+		    <div class="layui-inline">
 				<label class="layui-form-label label-size">备注</label>
 				<div class="layui-input-inline">
 					<input type="text" name="remark" class="layui-input" value="${resultPaper.remark}">