临时提交

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

 package cn.timer.api.controller.xcgl;
 
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
@@ -19,6 +20,13 @@ public class SalaryTool {
         return (double)Math.round(d*10000)/10000;
     }
     
+    public static double formatDouble_(double d) {
+    	double zhi = 0;
+    	DecimalFormat df = new DecimalFormat("0.00");
+    	zhi = Double.valueOf(df.format(d));
+    	return zhi;
+    }
+	
    /** 
     * 获取两个日期相差的月数 
     * @param d2  较大的日期 

src/main/java/cn/timer/api/dao/kqmk/KqglAssoRelationSummaryMapper.java

@@ -28,4 +28,6 @@ public interface KqglAssoRelationSummaryMapper extends BaseMapper<KqglAssoRelati
 	
 	
 	KqglAssoRelationSummary Businessdayclockin(int userid,int approvaltype,String apptime,int orgcode);
+	
+	List<KqglAssoRelationSummary> HolidayDetails(int orgcode,String apptime,int rules_type,int userid);
 }

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

+package cn.timer.api.dto.xcgl;
+
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AppPaysSalaryOneDto implements Serializable{/**
+	 * 
+	 */
+	private static final long serialVersionUID = 193839030071552299L;
+	
+	private String itemname;//基本工资、岗位津贴、事假、事假扣款......
+	private Double deduction;//扣款额
+	private String fieldone;//字段1（共2次、共11.5小时=1.44天）
+	private String fieldtwo;//字段2（共迟到8/分钟，早退20/分钟）
+	
+	List<AppPaysSalaryTwoDto> detailed;
+}

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

+package cn.timer.api.dto.xcgl;
+
+import java.io.Serializable;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AppPaysSalaryTwoDto implements Serializable{/**
+	 * 
+	 */
+	private static final long serialVersionUID = 5773269251839518331L;
+	
+	private String term;//早退时间、迟到时间....
+	private String specifictime;//时间 08:25
+	private Double field;//字段  8、3.5....
+}

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

+package cn.timer.api.dto.xcgl;
+
+import java.io.Serializable;
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AppPayslipDetailsDto implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1672310141723169753L;
+	
+	private Integer id;// 工资条id
+	private Double netsalary;// 实发工资
+	private String wagetime;// 工资时间
+	private Integer userid;// 用户id
+	private Integer sfyqrgz;// 是否已确认工资
+	
+	List<AppPaysSalaryOneDto> specific = null;
+}

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

+package cn.timer.api.dto.xcgl;
+
+import java.io.Serializable;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PushPayslipDto implements Serializable {
+	/**
+	* 
+	*/
+	private static final long serialVersionUID = 6984424343409821996L;
+	
+	private Integer gztid;//工资条id
+	private Integer xzzid;//薪资组id
+	private Integer userid;// 用户id
+	private String xzyf;// 薪资月份
+}

src/main/resources/mapping/kqmk/KqglAssoRelationSummaryMapper.xml

@@ -37,6 +37,16 @@
                 totals
     </sql>
 	
+	<select id="HolidayDetails" resultMap="BaseResultMap">
+		select su.*
+	    	from kqgl_asso_relation_summary su 
+			where su.approval_type = 2
+			and su.org_code = #{orgcode}
+			and su.ordernum = 1
+			and SUBSTR(su.app_time,1,7) = #{apptime}
+			and su.leave_type_id = (select ru.id from kqgl_asso_leave_rules ru where ru.org_code = #{orgcode} and ru.rules_type = #{rules_type})
+			and su.user_id = #{userid}
+	</select>
 	
 	<select id="SecondaryValue" resultMap="BaseResultMap">
     		select a.user_id,