农民工实名制--项目管理人员修改修改

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiAttendanceConstruction.java

@@ -38,8 +38,8 @@ public class BsSgcJsjdBuiAttendanceConstruction extends BaseEntity
     private String name;
 
     /** 考勤所属年月 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "考勤所属年月", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
+    @Excel(name = "考勤所属年月", width = 30, dateFormat = "yyyy-MM")
     @ApiModelProperty("考勤所属年月")
     private Date attendanceYear;
 

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiAttendanceSupervisor.java

@@ -38,8 +38,8 @@ public class BsSgcJsjdBuiAttendanceSupervisor extends BaseEntity
     private String name;
 
     /** 考勤所属年月 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "考勤所属年月", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
+    @Excel(name = "考勤所属年月", width = 30, dateFormat = "yyyy-MM")
     @ApiModelProperty("考勤所属年月")
     private Date attendanceYear;
 

jwtech-system/src/main/java/com/kms/build/domain/dto/GzjbDto.java

@@ -81,4 +81,16 @@ public class GzjbDto implements Serializable {
 
     private String remark;
 
+    //是否缴纳工资保证金
+    private String SalaryEnsureStatus;
+
+    //工资保证金缴纳方式
+    private String[] SalaryEnsureDepositMethods;
+
+    //工资保证金缴纳金额
+    private String SalaryEnsureDepositAmount;
+
+    //工资保证金缴纳时间
+    private String SalaryEnsureDepositDate;
+
 }

jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiGzjbService.java

@@ -1,5 +1,7 @@
 package com.kms.build.service;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,6 +10,7 @@ import com.github.pagehelper.PageInfo;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.core.domain.entity.SysDept;
 import com.jianwei.common.core.domain.entity.SysUser;
+import com.kms.build.domain.BsSgcJsjdBuiSalaryEnsure;
 import com.kms.build.domain.BsSgcjsjdBuiProInfo;
 import com.kms.build.domain.dto.GzjbDto;
 import com.kms.build.mapper.BsSgcJsjdBuiSalaryEnsureMapper;
@@ -25,6 +28,7 @@ import com.jianwei.common.core.service.BaseService;
 import com.kms.build.mapper.BsSgcJsjdBuiGzjbMapper;
 import com.kms.build.domain.BsSgcJsjdBuiGzjb;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -81,18 +85,21 @@ public class BsSgcJsjdBuiGzjbService extends BaseService<BsSgcJsjdBuiGzjbMapper,
                 sysXzqhService.getSubString(adcd),
                 "create_time",
                 sp.getPageNum(), sp.getPageSize());
-
-//        for (GzjbDto gz:list){
-//
-//        }
+        List<GzjbDto>gzjb=new ArrayList<>();
+        for (GzjbDto gz:list){
+            LambdaQueryWrapper<BsSgcJsjdBuiSalaryEnsure>se=new LambdaQueryWrapper<>();
+            List<BsSgcJsjdBuiSalaryEnsure> bsSgcJsjdBuiSalaryEnsures = bsSgcJsjdBuiSalaryEnsureMapper.selectList(se.eq(BsSgcJsjdBuiSalaryEnsure::getProNo, gz.getProNo())
+                    .eq(BsSgcJsjdBuiSalaryEnsure::getProCode, gz.getProCode()).orderByDesc());
+            if (CollectionUtil.isNotEmpty(bsSgcJsjdBuiSalaryEnsures)){
+                gz.setSalaryEnsureStatus("1");
+            }else {
+                gz.setSalaryEnsureStatus("0");
+            }
+        }
         Page<GzjbDto> page = new Page<>();
 
-        page.setTotal(list.size());
-        page.setRecords(list);
-
+        page.setTotal(gzjb.size());
+        page.setRecords(gzjb);
         return page;
-
-
-
     }
 }