工资条社保导入取时间

src/main/java/com/xjrsoft/module/personnel/service/impl/BasePersonnelLabourCapitalServiceImpl.java

@@ -38,11 +38,7 @@ import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -122,6 +118,7 @@ public class BasePersonnelLabourCapitalServiceImpl extends MPJBaseServiceImpl<Ba
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean importSocialSecurityData(AddBasePersonnelLabourCapitalDto dto, List<Map<Integer, Object>> excelDataList) throws ParseException {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -132,7 +129,10 @@ public class BasePersonnelLabourCapitalServiceImpl extends MPJBaseServiceImpl<Ba
         basePersonnelLabourCapital.setIdNumberColumn(1);
         basePersonnelLabourCapital.setJobNumberColumn(2);
         basePersonnelLabourCapital.setDateOfIssue(sdf.parse(dto.getDateOfIssue()));
-        basePersonnelLabourCapital.setYear(basePersonnelLabourCapital.getDateOfIssue().getYear());
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(basePersonnelLabourCapital.getDateOfIssue());
+        int year = calendar.get(Calendar.YEAR);
+        basePersonnelLabourCapital.setYear(year);
 
         List<BasePersonnelLabourCapitalTitle> titleList = initTitleList(excelDataList.get(0), new LinkedHashMap<>(), basePersonnelLabourCapital);
         List<BasePersonnelLabourCapitalData> dataList = initDataList(dto, excelDataList, 1);