Merge branch 'lal' into develop

src/main/java/cn/timer/api/dto/xcgl/PayTermDto.java

@@ -23,6 +23,8 @@ public class PayTermDto implements Serializable {
 	Integer xgsid;// 项对应的公式id
 	String xgsgs;// 项公式
 	
+	Integer zxzzid;
+	
 	Integer xiscustom;//是否自定义项（0：否；1：是）
 	
 	Integer xrulestate;//

src/main/resources/mapping/sbgjj/SbgjjAssoYjzdMapper.xml

@@ -86,7 +86,7 @@
     </sql>
     
     <select id="IndividualTotalsbgjj" resultMap="BaseResultMap">
-    	select * from sbgjj_asso_yjzd yj
+    	<!-- select * from sbgjj_asso_yjzd yj
 		where yj.cbryid = (
 				select cb.id from sbgjj_admin_cbry cb 
 				where cb.user_num = #{usernum}
@@ -97,7 +97,18 @@
 				and cb.state = 1
 				and cb.is_use = 1
 		)
-		and yj.qyid = #{qyid}
+		and yj.qyid = #{qyid} -->
+		
+		select * from sbgjj_asso_yjzd yj
+					where yj.zymonth = #{zymonth}
+					and yj.user_num = #{usernum}
+			and yj.cbryid = (
+			select cb.id from sbgjj_admin_cbry cb 
+			where cb.user_num = #{usernum}
+			and cb.state = 1
+			and cb.is_use = 1
+			and cb.qyid = #{qyid})
+			and yj.qyid = #{qyid}
     </select>
     
     <select id="MonthlycheckoutsheetList" resultMap="MonthlyCheckoutSheetMap">

src/main/resources/mapping/xcgl/XcglAssoJxgzMapper.xml

@@ -35,6 +35,7 @@
 		   		<result column="xoptionid" property="xoptionid"/>
 		   		<result column="xiscustom" property="xiscustom"/>
 		   		<result column="xrulestate" property="xrulestate"/>
+		   		<result column="zxzzid" property="zxzzid"/>
 		    </collection>
             
     </resultMap>
@@ -190,7 +191,8 @@
 				gzzx.optionid as xoptionid,
 				jxgz.xzzid as zxzzid,
 				gzzx.is_custom as xiscustom,
-				gzzx.rulestate as xrulestate
+				gzzx.rulestate as xrulestate,
+				gzzx.xzzid as zxzzid
 		from xcgl_asso_jxgz jxgz
 		LEFT JOIN xcgl_asso_jsgzzx as gzzx on gzzx.jxgzid = jxgz.id
 		where jxgz.xzzid = #{xzzid}