修改接口

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 = "用户名称")
+    private String name;
+
     /**
      * yyyy-mm 格式
      */

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ArchiveFileServiceImpl.java

@@ -16,7 +16,6 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

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

@@ -34,18 +34,18 @@ import java.math.BigDecimal;
 @ColumnWidth(25)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
-public class UserpayExcel implements Serializable {
+public class UserpayExcel{
     private static final long serialVersionUID = 1L;
 
     @ColumnWidth(15)
     @ExcelProperty("姓名")
-    private String userName;
+    private String name;
 
 /*    @ColumnWidth(15)
     @ExcelProperty("薪酬时间")
     private String costTime;*/
 
-
+/*
     @ColumnWidth(15)
     @ExcelProperty(value = "应出勤天数")
     private Integer yaAllDays;
@@ -120,6 +120,6 @@ public class UserpayExcel implements Serializable {
 
     @ColumnWidth(15)
     @ExcelProperty(value = "描述")
-    private String desc;
+    private String desc;*/
 
 }

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

@@ -27,6 +27,7 @@
         <result column="social_sec" property="socialSec"/>
         <result column="net_salary" property="netSalary"/>
         <result column="desc" property="desc"/>
+        <result column="name" property="name"/>
     </resultMap>
 
     <resultMap id="userpayInfoResultVOMap" type="org.springblade.control.vo.UserpayInfoVO">
@@ -58,14 +59,16 @@
 
 
     <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
+        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
     </select>
 
 
 
     <delete id="delUserPayInoByDate">
-        delete from m_role_post where cost_time = #{date}
+        delete from c_user_pay_info where DATE_FORMAT(cost_time,'%Y-%m') = #{date}
     </delete>
 
 </mapper>