提交

src/main/java/cn/timer/api/controller/xcgl/SalaryTool.java

@@ -10,6 +10,15 @@ public class SalaryTool {
 	static SimpleDateFormat mat = new SimpleDateFormat("yyyy-MM-dd");
 	static SimpleDateFormat mat = new SimpleDateFormat("yyyy-MM-dd");
 	static SimpleDateFormat matM = new SimpleDateFormat("yyyy-MM");
 	static SimpleDateFormat matM = new SimpleDateFormat("yyyy-MM");
 	
 	
+	/**
+     * 保留两位小数，四舍五入的一个老土的方法
+     * @param d
+     * @return
+     */
+    public static double formatDouble(double d) {
+        return (double)Math.round(d*10000)/10000;
+    }
+	
    /** 
    /** 
     * 获取两个日期相差的月数 
     * 获取两个日期相差的月数 
     * @param d2  较大的日期 
     * @param d2  较大的日期 

src/main/java/cn/timer/api/dao/sbgjj/SbgjjAssoYjzdMapper.java

@@ -23,5 +23,7 @@ public interface SbgjjAssoYjzdMapper extends BaseMapper<SbgjjAssoYjzd> {
 	SbgjjAssoYjzd zcjsjginsurance(int usernum,int qyid,String zymonth);
 	SbgjjAssoYjzd zcjsjginsurance(int usernum,int qyid,String zymonth);
 	
 	
 	List<MonthlyCheckoutSheetDto> MonthlycheckoutsheetList(MonthlyStatementDto monthlystatementdto);
 	List<MonthlyCheckoutSheetDto> MonthlycheckoutsheetList(MonthlyStatementDto monthlystatementdto);
+	
+	SbgjjAssoYjzd IndividualTotalsbgjj(String usernum,int qyid,String zymonth);
 
 
 }
 }

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

@@ -85,6 +85,21 @@
                 cbryid SbgjjAssoYjzd_cbryid
                 cbryid SbgjjAssoYjzd_cbryid
     </sql>
     </sql>
     
     
+    <select id="IndividualTotalsbgjj" resultMap="BaseResultMap">
+    	select * from sbgjj_asso_yjzd yj
+		where yj.cbryid = (
+				select cb.id from sbgjj_admin_cbry cb 
+				where cb.user_num = #{usernum}
+				and cb.qyid = #{qyid}
+				and cb.id in (select yj.cbryid from sbgjj_asso_yjzd yj
+					where yj.zymonth = #{zymonth}
+					and yj.user_num = #{usernum})
+				and cb.state = 1
+				and cb.is_use = 1
+		)
+		and yj.qyid = #{qyid}
+    </select>
+    
     <select id="MonthlycheckoutsheetList" resultMap="MonthlyCheckoutSheetMap">
     <select id="MonthlycheckoutsheetList" resultMap="MonthlyCheckoutSheetMap">
     		select emp.`name` as empname, 
     		select emp.`name` as empname, 
 			yjzd.user_num as usernum,
 			yjzd.user_num as usernum,