内控薪酬管理-回显与搜索

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/UserpayInfo.java

@@ -46,6 +46,12 @@ public class UserpayInfo extends BaseEntity {
     @ApiModelProperty(value = "用户id主键")
     private Long userId;
 
+    /**
+     * 租户ID
+     */
+    @ApiModelProperty(value = "租户ID")
+    private String tenantId;
+
     /**
      * 用户id主键
      */
@@ -161,6 +167,6 @@ public class UserpayInfo extends BaseEntity {
      * 描述
      */
     @ApiModelProperty(value = "描述")
-    private String desc;
+    private String remark;
 
 }

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/UserpayInfoVO.java

@@ -33,5 +33,5 @@ public class UserpayInfoVO extends UserpayInfo {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "用户姓名")
-    private String name;
+    private String month;
 }

blade-service/blade-control/src/main/java/org/springblade/control/controller/UserpayInfoController.java

@@ -28,6 +28,7 @@ import org.springblade.control.excel.UserpayExcel;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
@@ -150,11 +151,13 @@ public class UserpayInfoController extends BladeController {
         ZoneId zoneId = ZoneId.systemDefault();
         ZonedDateTime zonedDateTime = date.toInstant().atZone(zoneId);
         LocalDate localDate = zonedDateTime.toLocalDate();
+        String tenantId = AuthUtil.getTenantId();
         if(list!=null && list.size()>=1){
             List<UserpayInfo> vos = list.stream().map(f -> {
                 UserpayInfo tag = new UserpayInfo();
                 BeanUtil.copy(f,tag);
                 tag.setCostTime(localDate);
+                tag.setTenantId(tenantId);
                 return tag;
             }).collect(Collectors.toList());
             userpayInfoService.saveBatch(vos);

blade-service/blade-control/src/main/java/org/springblade/control/excel/UserpayExcel.java

@@ -41,11 +41,6 @@ public class UserpayExcel{
     @ExcelProperty("姓名")
     private String name;
 
-/*    @ColumnWidth(15)
-    @ExcelProperty("薪酬时间")
-    private String costTime;*/
-
-/*
     @ColumnWidth(15)
     @ExcelProperty(value = "应出勤天数")
     private Integer yaAllDays;
@@ -98,6 +93,10 @@ public class UserpayExcel{
     @ExcelProperty(value = "考勤扣款")
     private BigDecimal attendDuction;
 
+    @ColumnWidth(15)
+    @ExcelProperty(value = "事假扣款")
+    private BigDecimal absDuction;
+
     @ColumnWidth(15)
     @ExcelProperty(value = "其他扣款")
     private BigDecimal otherDuction;
@@ -106,20 +105,20 @@ public class UserpayExcel{
     @ExcelProperty(value = "应发工资")
     private BigDecimal grossPay;
 
-    @ColumnWidth(15)
-    @ExcelProperty(value = "代缴个税")
-    private BigDecimal personalTax;
-
     @ColumnWidth(15)
     @ExcelProperty(value = "代缴社保")
     private BigDecimal socialSec;
 
+    @ColumnWidth(15)
+    @ExcelProperty(value = "代缴个税")
+    private BigDecimal personalTax;
+
     @ColumnWidth(15)
     @ExcelProperty(value = "实发工资")
     private BigDecimal netSalary;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "描述")
-    private String desc;*/
+    @ExcelProperty(value = "备注")
+    private String remark;
 
 }

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserpayInfoMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.control.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.control.entity.UserpayInfo;
 import org.springblade.control.vo.UserpayInfoVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -38,7 +39,7 @@ public interface UserpayInfoMapper extends BaseMapper<UserpayInfo> {
      * @param userpayInfo
      * @return
      */
-    List<UserpayInfoVO> selectUserpayInfoPage(IPage page, UserpayInfoVO userpayInfo);
+    List<UserpayInfoVO> selectUserpayInfoPage(IPage page,@Param("vo") UserpayInfoVO userpayInfo);
 
     boolean delUserPayInoByDate(String date);
 

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserpayInfoMapper.xml

@@ -26,7 +26,7 @@
         <result column="personal_tax" property="personalTax"/>
         <result column="social_sec" property="socialSec"/>
         <result column="net_salary" property="netSalary"/>
-        <result column="desc" property="desc"/>
+        <result column="remark" property="remark"/>
         <result column="name" property="name"/>
     </resultMap>
 
@@ -34,10 +34,10 @@
         <result column="id" property="id"/>
         <result column="user_id" property="userId"/>
         <result column="cost_time" property="costTime"/>
-        <result column="y_all_days" property="yaAllDays"/>
-        <result column="s_all_days" property="saAllDays"/>
+        <result column="ya_all_days" property="yaAllDays"/>
+        <result column="sa_all_days" property="saAllDays"/>
         <result column="year_days" property="yearDays"/>
-        <result column="c_leave_days" property="caLeaveDays"/>
+        <result column="ca_leave_days" property="caLeaveDays"/>
         <result column="sick_leave_days" property="sickLeaveDays"/>
         <result column="absence_days" property="absenceDays"/>
         <result column="basic_salary" property="basicSalary"/>
@@ -53,16 +53,21 @@
         <result column="personal_tax" property="personalTax"/>
         <result column="social_sec" property="socialSec"/>
         <result column="net_salary" property="netSalary"/>
-        <result column="desc" property="desc"/>
+        <result column="remark" property="remark"/>
         <result column="name" property="name"/>
     </resultMap>
 
 
     <select id="selectUserpayInfoPage" resultMap="userpayInfoResultVOMap">
         select *
-             /*,(SELECT name from blade_user b where a.user_id = b.id) as name */
         from c_user_pay_info a
         where a.is_deleted = 0
+        <if test="vo.name != null and vo.name != ''">
+            and a.name = #{vo.name}
+        </if>
+        <if test="vo.month != null and vo.month != ''">
+            and DATE_FORMAT(a.cost_time ,'%Y-%m') = #{vo.month}
+        </if>
     </select>