浏览代码

人员到账比列修复

yq 3 年之前
父节点
当前提交
a8c448a175

+ 3 - 0
src/main/java/com/usky/dxtop/model/Staff.java

@@ -79,5 +79,8 @@ public class Staff implements Serializable {
     @JSONField(name = "faceid")
     private String face;
 
+    @TableField(exist = false)
+    private Long radioId;
+
 
 }

+ 3 - 1
src/main/java/com/usky/dxtop/service/impl/StaffRadioServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -25,7 +26,8 @@ public class StaffRadioServiceImpl extends ServiceImpl<StaffRadioMapper, StaffRa
 
     @Override
     public void addList(List<StaffRadio> list) {
-        list.forEach(staffRadio -> {
+        List<StaffRadio> collect = list.stream().filter(staffRadio -> null != staffRadio.getRadioId() && 0 != staffRadio.getRadioId()).collect(Collectors.toList());
+        collect.forEach(staffRadio -> {
             LambdaUpdateWrapper<StaffRadio> updateWrapper = Wrappers.lambdaUpdate();
             updateWrapper.eq(StaffRadio::getStaffId, staffRadio.getStaffId())
                     .eq(StaffRadio::getRadioId, staffRadio.getRadioId())

+ 1 - 1
src/main/resources/mapper/StaffMapper.xml

@@ -19,7 +19,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
     <select id="page" resultType="com.usky.dxtop.model.Staff">
-        select s.*,d.name as deptName,tr.identity,tr.proportion
+        select s.*,d.name as deptName,tr.identity,tr.proportion,tr.id as radioId
         from staff as s
         left join dept as d
         on s.pid = d.d_id