Merge remote-tracking branch 'origin/master'

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java

@@ -142,7 +142,7 @@ public class BsSgcJsjdBuiAttendanceInformationController extends BaseController
                     BeanUtils.copyProperties(bsSgcJsjdBuiAttendanceInformationExcel,bsSgcJsjdBuiAttendanceInformation);
                     BsSgcJsjdBuiRealName one = bsSgcJsjdBuiRealNameService.getOne(Wrappers.lambdaQuery(BsSgcJsjdBuiRealName.class)
                             .eq(BsSgcJsjdBuiRealName::getIdNo, bsSgcJsjdBuiAttendanceInformationExcel.getIdNo())
-                            .eq(BsSgcJsjdBuiRealName::getName, bsSgcJsjdBuiAttendanceInformationExcel.getName())
+//                            .eq(BsSgcJsjdBuiRealName::getName, bsSgcJsjdBuiAttendanceInformationExcel.getWorkerName())
                             .eq(BsSgcJsjdBuiRealName::getProCode, proCode)
                             .eq(BsSgcJsjdBuiRealName::getProNo, proNo),false);
                     bsSgcJsjdBuiAttendanceInformation.setSocialCreditCode(one.getSocialCreditCode());

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

@@ -12,10 +12,10 @@ public class BsSgcJsjdBuiAttendanceInformationExcel {
 
     @Excel(name = "姓名")
     @ApiModelProperty("姓名")
-    public String name;
+    public String workerName;
 
     /** 考勤所属年月 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM")
     @Excel(name = "考勤所属年月", width = 30, dateFormat = "yyyy-MM")
     @ApiModelProperty("考勤所属年月")
     public Date attendanceYear;