日期修改

src/main/java/platform/modules/company/service/ProjectApplicationService.java

@@ -1007,7 +1007,7 @@ public class ProjectApplicationService extends BaseService<ProjectApplication> {
      *
      * @param apply
      */
-    private FileDown annexThree(ProjectApplication apply) {
+    public FileDown annexThree(ProjectApplication apply) {
         final String annexName = "苏州高新区工业高质量发展扶持资金申报表";
         String date = DateUtil.getCurrentDateString("yyyy年MM月dd日");
 
@@ -1043,16 +1043,17 @@ public class ProjectApplicationService extends BaseService<ProjectApplication> {
 
         currencyUnit(companyInfo.getFixed_assets_currency_unit());
 
+        int year = getYearFromApplyDeclareationId(apply);
         //近三年营收情况
         for (int i = 0; i < 3; i++) {
-            SimpleDateFormat format = new SimpleDateFormat("yyyy");
-            Calendar c = Calendar.getInstance();
-            c.setTime(new Date());
-            c.add(Calendar.YEAR, 0 - (i + 1));
-            Date y = c.getTime();
-            String year = format.format(y);
-
-            dataMap.put("year" + i, year);
+//            SimpleDateFormat format = new SimpleDateFormat("yyyy");
+//            Calendar c = Calendar.getInstance();
+//            c.setTime(new Date());
+//            c.add(Calendar.YEAR, 0 - (i + 1));
+//            Date y = c.getTime();
+//            String year = format.format(y);
+            String yearStr = String.valueOf(year - i - 1);
+            dataMap.put("year" + i, String.valueOf(yearStr));
             dataMap.put("oi" + i, operationsInfo.get(i).getOperation_income());
             dataMap.put("si" + i, operationsInfo.get(i).getSales_income());
             dataMap.put("pi" + i, operationsInfo.get(i).getProcessing_income());
@@ -1068,6 +1069,18 @@ public class ProjectApplicationService extends BaseService<ProjectApplication> {
         return getFileDown(annexName, annexOutputUrl);
     }
 
+    private int getYearFromApplyDeclareationId(ProjectApplication apply) {
+        Integer declaration_id = apply.getDeclaration_id();
+        ProjectDeclaration projectDeclaration = projectDeclarationService.selectById(String.valueOf(declaration_id));
+        int year = Integer.parseInt(DateUtil.getCurrentDateString("yyyy"));
+        try {
+            year = DateUtil.getYearFromDataString(projectDeclaration.getApply_startdate());
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        return year;
+    }
+
     private String currencyUnit(Integer currency_unit_id) {
         DictionaryItem item = dictionaryItemService.findById(currency_unit_id);
         if (item == null) {
@@ -1088,7 +1101,8 @@ public class ProjectApplicationService extends BaseService<ProjectApplication> {
 //        final String annexName = "2019年苏州高新区工业经济发展专项扶持资金申请资料";
         String currentYear = "2022";
         try {
-            currentYear = DateUtil.getCurrentYear();
+//            currentYear = DateUtil.getCurrentYear();
+            currentYear = String.valueOf(getYearFromApplyDeclareationId(apply));
         } catch (Exception e) {
             currentYear = "2022";
             e.printStackTrace();