提交

src/main/java/cn/timer/api/bean/xcgl/XcglAssoBszqsz.java

+package cn.timer.api.bean.xcgl;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author LAL 2020-10-09
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "xcgl_asso_bszqsz")
+@ApiModel("报税周期设置")
+public class XcglAssoBszqsz extends Model<XcglAssoBszqsz> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "id id", example = "101")
+	private Integer id;
+
+	@ApiModelProperty(value = "报税周期(1:当月报税；2:次月报税) 报税周期(1:当月报税；2:次月报税)", example = "101")
+	private Integer taxReturnCycle;
+
+	@ApiModelProperty(value = "企业ID 企业ID", example = "101")
+	private Integer qyid;
+
+}
\ No newline at end of file

src/main/java/cn/timer/api/bean/xcgl/XcglAssoGsjsmx.java

+package cn.timer.api.bean.xcgl;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+* @author LAL 2020-10-09
+*/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name="xcgl_asso_gsjsmx")
+@ApiModel("个税计算明细")
+public class XcglAssoGsjsmx extends Model<XcglAssoGsjsmx> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue
+    @TableId (type = IdType.AUTO)
+	@ApiModelProperty(value="Id Id",example="101")
+    private Integer id;
+    
+	@ApiModelProperty(value="用户id ",example="用户id")
+    private String userNum;
+	
+	@ApiModelProperty(value="用户姓名 ",example="用户姓名")
+	private String userName;
+    
+	@ApiModelProperty(value="薪资月 ",example="薪资月")
+    private String salaryMonth;
+    
+	@ApiModelProperty(value="税款所属月份 ",example="税款所属月份")
+    private String taxMonth;
+    
+	@ApiModelProperty(value="本月个税 ",example="本月个税")
+    private Double thmonthPersonal;
+    
+	@ApiModelProperty(value="累计子女教育 ",example="累计子女教育")
+    private Double cumZljy;
+    
+	@ApiModelProperty(value="累计住房贷款利息 ",example="累计住房贷款利息")
+    private Double cumZfdklx;
+    
+	@ApiModelProperty(value="累计住房租金 ",example="累计住房租金")
+    private Double cumZfzj;
+    
+	@ApiModelProperty(value="累计赡养老人 ",example="累计赡养老人")
+    private Double cumSylr;
+    
+	@ApiModelProperty(value="累计继续教育 ",example="累计继续教育")
+    private Double cumJxjy;
+    
+	@ApiModelProperty(value="累计专项附加扣除 ",example="累计专项附加扣除")
+    private Double cumZxfjkc;
+    
+	@ApiModelProperty(value="计税类型 ",example="计税类型")
+    private String taxType;
+    
+	@ApiModelProperty(value="本期收入 ",example="本期收入")
+    private Double currentIncome;
+    
+	@ApiModelProperty(value="本期专项扣除 ",example="本期专项扣除")
+    private Double currentSpecialDeduction;
+    
+	@ApiModelProperty(value="累计收入额 ",example="累计收入额")
+    private Double cumSre;
+    
+	@ApiModelProperty(value="累计减除费用 ",example="累计减除费用")
+    private Double cumJcfy;
+    
+	@ApiModelProperty(value="累计专项扣除 ",example="累计专项扣除")
+    private Double cumZxkc;
+    
+	@ApiModelProperty(value="累计其他扣除 ",example="累计其他扣除")
+    private Double cumQtkc;
+    
+	@ApiModelProperty(value="累计应纳税所得额 ",example="累计应纳税所得额")
+    private Double cumYnssde;
+    
+	@ApiModelProperty(value="税率 ",example="税率")
+    private Double taxRate;
+    
+	@ApiModelProperty(value="速算扣除数 ",example="速算扣除数")
+    private Double quickCalculationDeduction;
+    
+	@ApiModelProperty(value="累计应纳税额 ",example="累计应纳税额")
+    private Double cumYnse;
+    
+	@ApiModelProperty(value="累计已预缴税额 ",example="累计已预缴税额")
+    private Double cumYyjse;
+    
+	@ApiModelProperty(value="累计应补（退）税额 ",example="累计应补（退）税额")
+    private Double cumYbtse;
+    
+	@ApiModelProperty(value="企业id 企业id",example="101")
+    private Integer qyid;
+    
+
+}
\ No newline at end of file

src/main/java/cn/timer/api/bean/xcgl/XcglAssoTaxFormula.java

+package cn.timer.api.bean.xcgl;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+* @author LAL 2020-10-09
+*/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name="xcgl_asso_tax_formula")
+@ApiModel("个税税率表")
+public class XcglAssoTaxFormula extends Model<XcglAssoTaxFormula> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue
+    @TableId (type = IdType.AUTO)
+	@ApiModelProperty(value="id id",example="101")
+    private Integer id;
+    
+	@ApiModelProperty(value="应税起始 ",example="应税起始")
+    private Double taxablestart;
+    
+	@ApiModelProperty(value="应税结束 ",example="应税结束")
+    private Double taxableend;
+    
+	@ApiModelProperty(value="税率 税率",example="101")
+    private Integer taxrate;
+    
+	@ApiModelProperty(value="速算扣除数 ",example="速算扣除数")
+    private Double deductions;
+    
+	@ApiModelProperty(value="企业ID 企业ID",example="101")
+    private Integer qyid;
+    
+
+}
\ No newline at end of file

src/main/java/cn/timer/api/dao/xcgl/XcglAssoBszqszMapper.java

+package cn.timer.api.dao.xcgl;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import cn.timer.api.bean.xcgl.XcglAssoBszqsz;
+
+/**
+*  报税周期设置
+* @author LAL 2020-10-09
+*/
+@Repository
+public interface XcglAssoBszqszMapper extends BaseMapper<XcglAssoBszqsz> {
+
+
+
+}

src/main/java/cn/timer/api/dao/xcgl/XcglAssoGsjsmxMapper.java

+package cn.timer.api.dao.xcgl;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import cn.timer.api.bean.xcgl.XcglAssoGsjsmx;
+import cn.timer.api.dto.xcgl.SearchSalariedPeopleDto;
+import cn.timer.api.dto.xcgl.XcglAssoGsjsmxDto;
+
+/**
+*  个税计算明细
+* @author LAL 2020-10-09
+*/
+@Repository
+public interface XcglAssoGsjsmxMapper extends BaseMapper<XcglAssoGsjsmx> {
+
+	
+	IPage<XcglAssoGsjsmxDto> SelectIndividualincomedetails(IPage<XcglAssoGsjsmxDto> page,@Param("param") SearchSalariedPeopleDto searchsalariedpeopledto);
+	
+	List<XcglAssoGsjsmx> Allyearround(String year,String usernum,Integer qyid);
+
+}

src/main/java/cn/timer/api/dao/xcgl/XcglAssoTaxFormulaMapper.java

+package cn.timer.api.dao.xcgl;
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import cn.timer.api.bean.xcgl.XcglAssoTaxFormula;
+
+/**
+*  个税税率表
+* @author LAL 2020-10-09
+*/
+@Repository
+public interface XcglAssoTaxFormulaMapper extends BaseMapper<XcglAssoTaxFormula> {
+
+
+
+}

src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzdazdyMapper.java

 package cn.timer.api.dao.xcgl;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import java.util.List;
 
 import org.springframework.stereotype.Repository;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import cn.timer.api.bean.xcgl.XcglAssoXzdazdy;
 import cn.timer.api.dto.xcgl.ChangeSalaryDto;
+import cn.timer.api.dto.xcgl.CheckSalaryStaffDto;
 import cn.timer.api.dto.xcgl.FixedSalaryStaffDto;
 import cn.timer.api.dto.xcgl.SearchSalariedPeopleDto;
 
@@ -33,4 +33,6 @@ public interface XcglAssoXzdazdyMapper extends BaseMapper<XcglAssoXzdazdy> {
 	List<FixedSalaryStaffDto> SalaryAdjustmentRecord(Integer orgcode,Integer empnum);
 	
 	XcglAssoXzdazdy SalaryFixedWages(String zdmc);
+	
+	List<FixedSalaryStaffDto> selectPaygroupStaff(CheckSalaryStaffDto checksearch);
 }

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

+package cn.timer.api.dto.xcgl;
+
+import cn.timer.api.utils.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CheckSalaryStaffDto extends Page{
+	
+	@ApiModelProperty(value="姓名/工号 ",example="姓名/工号")
+	String text;
+	
+	@ApiModelProperty(value="薪资组id ",example="薪资组id")
+	int paygroupid;
+	
+	@ApiModelProperty(value="企业编号 ",example="企业编号")
+	int orgcode;
+}

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

+package cn.timer.api.dto.xcgl;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ImportDescriptionDto {
+	
+	int success = 0;//成功
+	int failure = 0;//失败
+	int toupdate = 0;//更新
+	String[] names;
+}

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

+package cn.timer.api.dto.xcgl;
+
+import java.io.Serializable;
+
+import cn.timer.api.dto.xcgl.SpecialDeductionDto.SpecialDeductionDtoBuilder;
+import cn.timer.api.utils.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IndividualTaxDetailsDto extends Page implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value="用户手机号 ",example="用户手机号")
+    private String phone;
+	
+	@ApiModelProperty(value="用户姓名 ",example="用户姓名")
+    private String userName;
+    
+	@ApiModelProperty(value="薪资月 ",example="薪资月")
+    private String salaryMonth;
+    
+	@ApiModelProperty(value="税款所属月份 ",example="税款所属月份")
+    private String taxMonth;
+    
+	@ApiModelProperty(value="本月个税 ",example="本月个税")
+    private String thmonthPersonal;
+    
+	@ApiModelProperty(value="累计子女教育 ",example="累计子女教育")
+    private String cumZljy;
+    
+	@ApiModelProperty(value="累计住房贷款利息 ",example="累计住房贷款利息")
+    private String cumZfdklx;
+    
+	@ApiModelProperty(value="累计住房租金 ",example="累计住房租金")
+    private String cumZfzj;
+    
+	@ApiModelProperty(value="累计赡养老人 ",example="累计赡养老人")
+    private String cumSylr;
+    
+	@ApiModelProperty(value="累计继续教育 ",example="累计继续教育")
+    private String cumJxjy;
+    
+	@ApiModelProperty(value="累计专项附加扣除 ",example="累计专项附加扣除")
+    private String cumZxfjkc;
+    
+	@ApiModelProperty(value="计税类型 ",example="计税类型")
+    private String taxType;
+    
+	@ApiModelProperty(value="本期收入 ",example="本期收入")
+    private String currentIncome;
+    
+	@ApiModelProperty(value="本期专项扣除 ",example="本期专项扣除")
+    private String currentSpecialDeduction;
+    
+	@ApiModelProperty(value="累计收入额 ",example="累计收入额")
+    private String cumSre;
+    
+	@ApiModelProperty(value="累计减除费用 ",example="累计减除费用")
+    private String cumJcfy;
+    
+	@ApiModelProperty(value="累计专项扣除 ",example="累计专项扣除")
+    private String cumZxkc;
+    
+	@ApiModelProperty(value="累计其他扣除 ",example="累计其他扣除")
+    private String cumQtkc;
+    
+	@ApiModelProperty(value="累计应纳税所得额 ",example="累计应纳税所得额")
+    private String cumYnssde;
+    
+	@ApiModelProperty(value="税率 ",example="税率")
+    private String taxRate;
+    
+	@ApiModelProperty(value="速算扣除数 ",example="速算扣除数")
+    private String quickCalculationDeduction;
+    
+	@ApiModelProperty(value="累计应纳税额 ",example="累计应纳税额")
+    private String cumYnse;
+    
+	@ApiModelProperty(value="累计已预缴税额 ",example="累计已预缴税额")
+    private String cumYyjse;
+    
+	@ApiModelProperty(value="累计应补（退）税额 ",example="累计应补（退）税额")
+    private String cumYbtse;
+    
+}

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

+package cn.timer.api.dto.xcgl;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class XcglAssoGsjsmxDto implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7019484399933503292L;
+	
+	@ApiModelProperty(value = "员工手机号", example = "员工手机号")
+	private String phone;
+
+	@ApiModelProperty(value = "用户id ", example = "用户id")
+	private String userNum;
+
+	@ApiModelProperty(value = "用户姓名 ", example = "用户姓名")
+	private String userName;
+
+	@ApiModelProperty(value = "薪资月 ", example = "薪资月")
+	private String salaryMonth;
+
+	@ApiModelProperty(value = "税款所属月份 ", example = "税款所属月份")
+	private String taxMonth;
+
+	@ApiModelProperty(value = "本月个税 ", example = "本月个税")
+	private Double thmonthPersonal;
+
+	@ApiModelProperty(value = "累计子女教育 ", example = "累计子女教育")
+	private Double cumZljy;
+
+	@ApiModelProperty(value = "累计住房贷款利息 ", example = "累计住房贷款利息")
+	private Double cumZfdklx;
+
+	@ApiModelProperty(value = "累计住房租金 ", example = "累计住房租金")
+	private Double cumZfzj;
+
+	@ApiModelProperty(value = "累计赡养老人 ", example = "累计赡养老人")
+	private Double cumSylr;
+
+	@ApiModelProperty(value = "累计继续教育 ", example = "累计继续教育")
+	private Double cumJxjy;
+
+	@ApiModelProperty(value = "累计专项附加扣除 ", example = "累计专项附加扣除")
+	private Double cumZxfjkc;
+
+	@ApiModelProperty(value = "计税类型 ", example = "计税类型")
+	private String taxType;
+
+	@ApiModelProperty(value = "本期收入 ", example = "本期收入")
+	private Double currentIncome;
+
+	@ApiModelProperty(value = "本期专项扣除 ", example = "本期专项扣除")
+	private Double currentSpecialDeduction;
+
+	@ApiModelProperty(value = "累计收入额 ", example = "累计收入额")
+	private Double cumSre;
+
+	@ApiModelProperty(value = "累计减除费用 ", example = "累计减除费用")
+	private Double cumJcfy;
+
+	@ApiModelProperty(value = "累计专项扣除 ", example = "累计专项扣除")
+	private Double cumZxkc;
+
+	@ApiModelProperty(value = "累计其他扣除 ", example = "累计其他扣除")
+	private Double cumQtkc;
+
+	@ApiModelProperty(value = "累计应纳税所得额 ", example = "累计应纳税所得额")
+	private Double cumYnssde;
+
+	@ApiModelProperty(value = "税率 ", example = "税率")
+	private Double taxRate;
+
+	@ApiModelProperty(value = "速算扣除数 ", example = "速算扣除数")
+	private Double quickCalculationDeduction;
+
+	@ApiModelProperty(value = "累计应纳税额 ", example = "累计应纳税额")
+	private Double cumYnse;
+
+	@ApiModelProperty(value = "累计已预缴税额 ", example = "累计已预缴税额")
+	private Double cumYyjse;
+
+	@ApiModelProperty(value = "累计应补（退）税额 ", example = "累计应补（退）税额")
+	private Double cumYbtse;
+
+	@ApiModelProperty(value = "企业id 企业id", example = "101")
+	private Integer qyid;
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.timer.api.dao.xcgl.XcglAssoBszqszMapper">
+
+    <resultMap id="BaseResultMap" type="cn.timer.api.bean.xcgl.XcglAssoBszqsz" >
+                <id column="id" property="id" />
+                <result column="tax_return_cycle" property="taxReturnCycle" />
+                <result column="qyid" property="qyid" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+                id,
+                tax_return_cycle,
+                qyid
+    </sql>
+    
+    <sql id="Base_Column_List_Alias">
+                id XcglAssoBszqsz_id,
+                tax_return_cycle XcglAssoBszqsz_tax_return_cycle,
+                qyid XcglAssoBszqsz_qyid
+    </sql>
+
+	<!-- 
+
+    <insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.xcgl.XcglAssoBszqsz">
+        INSERT INTO xcgl_asso_bszqsz
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                        <if test ='null != taxReturnCycle'>
+                        tax_return_cycle,
+                        </if>
+                        <if test ='null != qyid'>
+                        qyid
+                        </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                        <if test ='null != taxReturnCycle'>
+                        #{taxReturnCycle},
+                        </if>
+                        <if test ='null != qyid'>
+                        #{qyid}
+                        </if>
+        </trim>
+    </insert>
+
+    <delete id="delete" >
+        DELETE FROM xcgl_asso_bszqsz
+        WHERE id = #{id}
+    </delete>
+
+    <update id="update" parameterType="cn.timer.api.bean.xcgl.XcglAssoBszqsz">
+        UPDATE xcgl_asso_bszqsz
+        <set>
+                    <if test ='null != taxReturnCycle'>tax_return_cycle = #{taxReturnCycle},</if>
+                    <if test ='null != qyid'>qyid = #{qyid}</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
+
+    <select id="load" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List" />
+        FROM xcgl_asso_bszqsz
+        WHERE id = #{id}
+    </select>
+
+    <select id="pageList" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List" />
+        FROM xcgl_asso_bszqsz
+        LIMIT #{offset}, #{pageSize}
+    </select>
+
+    <select id="pageListCount" resultType="java.lang.Integer">
+        SELECT count(1)
+        FROM xcgl_asso_bszqsz
+    </select>
+
+	 -->
+
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.timer.api.dao.xcgl.XcglAssoGsjsmxMapper">
+
+    <resultMap id="BaseResultMap" type="cn.timer.api.bean.xcgl.XcglAssoGsjsmx" >
+                <result column="Id" property="id" />
+                <result column="user_num" property="userNum" />
+                <result column="user_name" property="userName" />
+                <result column="salary_month" property="salaryMonth" />
+                <result column="tax_month" property="taxMonth" />
+                <result column="thmonth_personal" property="thmonthPersonal" />
+                <result column="cum_zljy" property="cumZljy" />
+                <result column="cum_zfdklx" property="cumZfdklx" />
+                <result column="cum_zfzj" property="cumZfzj" />
+                <result column="cum_sylr" property="cumSylr" />
+                <result column="cum_jxjy" property="cumJxjy" />
+                <result column="cum_zxfjkc" property="cumZxfjkc" />
+                <result column="tax_type" property="taxType" />
+                <result column="current_income" property="currentIncome" />
+                <result column="current_special_deduction" property="currentSpecialDeduction" />
+                <result column="cum_sre" property="cumSre" />
+                <result column="cum_jcfy" property="cumJcfy" />
+                <result column="cum_zxkc" property="cumZxkc" />
+                <result column="cum_qtkc" property="cumQtkc" />
+                <result column="cum_ynssde" property="cumYnssde" />
+                <result column="tax_rate" property="taxRate" />
+                <result column="quick_calculation_deduction" property="quickCalculationDeduction" />
+                <result column="cum_ynse" property="cumYnse" />
+                <result column="cum_yyjse" property="cumYyjse" />
+                <result column="cum_ybtse" property="cumYbtse" />
+                <result column="qyid" property="qyid" />
+    </resultMap>
+    
+    <resultMap id="BaseXcglAssoGsjsmxDto" type="cn.timer.api.dto.xcgl.XcglAssoGsjsmxDto" >
+    			<result column="phone" property="phone" />
+                <result column="user_num" property="userNum" />
+                <result column="user_name" property="userName" />
+                <result column="salary_month" property="salaryMonth" />
+                <result column="tax_month" property="taxMonth" />
+                <result column="thmonth_personal" property="thmonthPersonal" />
+                <result column="cum_zljy" property="cumZljy" />
+                <result column="cum_zfdklx" property="cumZfdklx" />
+                <result column="cum_zfzj" property="cumZfzj" />
+                <result column="cum_sylr" property="cumSylr" />
+                <result column="cum_jxjy" property="cumJxjy" />
+                <result column="cum_zxfjkc" property="cumZxfjkc" />
+                <result column="tax_type" property="taxType" />
+                <result column="current_income" property="currentIncome" />
+                <result column="current_special_deduction" property="currentSpecialDeduction" />
+                <result column="cum_sre" property="cumSre" />
+                <result column="cum_jcfy" property="cumJcfy" />
+                <result column="cum_zxkc" property="cumZxkc" />
+                <result column="cum_qtkc" property="cumQtkc" />
+                <result column="cum_ynssde" property="cumYnssde" />
+                <result column="tax_rate" property="taxRate" />
+                <result column="quick_calculation_deduction" property="quickCalculationDeduction" />
+                <result column="cum_ynse" property="cumYnse" />
+                <result column="cum_yyjse" property="cumYyjse" />
+                <result column="cum_ybtse" property="cumYbtse" />
+                <result column="qyid" property="qyid" />
+    </resultMap>
+	
+	<select id="SelectIndividualincomedetails" resultMap="BaseXcglAssoGsjsmxDto">
+		select em.phone,
+				gs.*
+			from xcgl_asso_gsjsmx gs 
+		LEFT JOIN yggl_main_emp as em on em.emp_num = gs.user_num and em.org_code = #{param.orgcode}
+		where gs.qyid = #{param.orgcode}
+		<if test="param.datetime != ''" >
+			and gs.salary_month = #{param.datetime}
+		</if>
+		<if test="param.status != ''" >
+			and em.job_status = #{param.status}
+		</if>
+		<if test="param.text != ''" >
+			and (em.`name` like CONCAT('%',#{param.text},'%') or em.emp_num = #{param.text})
+		</if>
+	</select>
+	
+	<select id="Allyearround" resultMap="BaseResultMap">
+		select * from xcgl_asso_gsjsmx gs
+			where 1=1
+			and SUBSTR(gs.salary_month,1,4) = #{year}
+			and gs.user_num = #{usernum}
+			and gs.qyid = #{qyid}
+	</select>
+	
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.timer.api.dao.xcgl.XcglAssoTaxFormulaMapper">
+
+    <resultMap id="BaseResultMap" type="cn.timer.api.bean.xcgl.XcglAssoTaxFormula" >
+                <id column="id" property="id" />
+                <result column="taxablestart" property="taxablestart" />
+                <result column="taxableend" property="taxableend" />
+                <result column="taxrate" property="taxrate" />
+                <result column="deductions" property="deductions" />
+                <result column="qyid" property="qyid" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+                id,
+                taxablestart,
+                taxableend,
+                taxrate,
+                deductions,
+                qyid
+    </sql>
+    
+    <sql id="Base_Column_List_Alias">
+                id XcglAssoTaxFormula_id,
+                taxablestart XcglAssoTaxFormula_taxablestart,
+                taxableend XcglAssoTaxFormula_taxableend,
+                taxrate XcglAssoTaxFormula_taxrate,
+                deductions XcglAssoTaxFormula_deductions,
+                qyid XcglAssoTaxFormula_qyid
+    </sql>
+
+	<!-- 
+
+    <insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.xcgl.XcglAssoTaxFormula">
+        INSERT INTO xcgl_asso_tax_formula
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                        <if test ='null != taxablestart'>
+                        taxablestart,
+                        </if>
+                        <if test ='null != taxableend'>
+                        taxableend,
+                        </if>
+                        <if test ='null != taxrate'>
+                        taxrate,
+                        </if>
+                        <if test ='null != deductions'>
+                        deductions,
+                        </if>
+                        <if test ='null != qyid'>
+                        qyid
+                        </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                        <if test ='null != taxablestart'>
+                        #{taxablestart},
+                        </if>
+                        <if test ='null != taxableend'>
+                        #{taxableend},
+                        </if>
+                        <if test ='null != taxrate'>
+                        #{taxrate},
+                        </if>
+                        <if test ='null != deductions'>
+                        #{deductions},
+                        </if>
+                        <if test ='null != qyid'>
+                        #{qyid}
+                        </if>
+        </trim>
+    </insert>
+
+    <delete id="delete" >
+        DELETE FROM xcgl_asso_tax_formula
+        WHERE id = #{id}
+    </delete>
+
+    <update id="update" parameterType="cn.timer.api.bean.xcgl.XcglAssoTaxFormula">
+        UPDATE xcgl_asso_tax_formula
+        <set>
+                    <if test ='null != taxablestart'>taxablestart = #{taxablestart},</if>
+                    <if test ='null != taxableend'>taxableend = #{taxableend},</if>
+                    <if test ='null != taxrate'>taxrate = #{taxrate},</if>
+                    <if test ='null != deductions'>deductions = #{deductions},</if>
+                    <if test ='null != qyid'>qyid = #{qyid}</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
+
+    <select id="load" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List" />
+        FROM xcgl_asso_tax_formula
+        WHERE id = #{id}
+    </select>
+
+    <select id="pageList" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List" />
+        FROM xcgl_asso_tax_formula
+        LIMIT #{offset}, #{pageSize}
+    </select>
+
+    <select id="pageListCount" resultType="java.lang.Integer">
+        SELECT count(1)
+        FROM xcgl_asso_tax_formula
+    </select>
+
+	 -->
+
+</mapper>
\ No newline at end of file

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

@@ -208,6 +208,43 @@
 			and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text})
 		</if>
 	</select>
+	
+	
+	<select id="selectPaygroupStaff" resultMap="FixedSalaryStaffMap">
+			select emp.emp_num empnum, 
+			emp.`name` empname,
+			case emp.job_type
+				when 0 then '全职'
+				when 1 then '实习生'
+				when 2 then '兼职'
+				when 3 then '劳务派遣'
+				when 4 then '劳务'
+				when 5 then '派遣'
+				when 6 then '外包'
+				else '退休返聘' end as empjobtype,
+			case emp.job_status 
+				when 0 then '试用'
+				when 1 then '正式'
+				when 2 then '离职中'
+				else '已离职' end as empjobstatus,
+			SUBSTR(emp.rz_time,1,10) emprztime ,
+			SUBSTR(emp.zz_time,1,10) empzztime,
+			IF(dadx.userid IS NOT NULL,1,0) as sfdx,
+			dadx.sxrq as tratime,
+			xzdaz.id as dazid,
+			xzdaz.xzdazdyid as xzdazdyid,
+			xzdaz.rsz as dazrsz,
+			xzdaz.xzdadxid as xzdadxid
+		  from yggl_main_emp emp
+		LEFT JOIN xcgl_asso_xzdadx as dadx on dadx.userid = emp.emp_num and dadx.txzt = 0
+		LEFT JOIN xcgl_asso_xzdaz as xzdaz on xzdaz.xzdadxid = dadx.id
+		LEFT JOIN xcgl_asso_xzury as xz on xz.userid = emp.emp_num and xz.qyid = emp.org_code
+		where emp.org_code = #{orgcode}
+		and xz.xzzid = #{paygroupid}
+		<if test="text != ''" >
+			and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text})
+		</if>
+	</select>