Merge remote-tracking branch 'origin/master'

# Conflicts:
#	science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectController.java

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectKpitDTO.java

@@ -49,10 +49,10 @@ public class ComProjectKpitDTO extends BaseDTO {
     private Integer displayOrder;
     /** 一级指标显示 */
     @ApiModelProperty(value = "一级指标显示", position = 7)
-    private boolean oneDisplay;
+    private Boolean oneDisplay;
     /** 二级指标显示 */
     @ApiModelProperty(value = "二级指标显示", position = 7)
-    private boolean towDisplay;
+    private Boolean towDisplay;
     /** 一级指标行合并数 */
     @ApiModelProperty(value = "一级指标行合并数", position = 7)
     private Integer oneRowSpan;

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectController.java

@@ -6,10 +6,7 @@ import com.yiboshi.arch.base.ResponseDataModel;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.config.annotation.Logs;
 import com.yiboshi.science.config.security.SecurityUserHolder;
-import com.yiboshi.science.entity.ComProject;
-import com.yiboshi.science.entity.ComProjectAudit;
-import com.yiboshi.science.entity.ComProjectTask;
-import com.yiboshi.science.entity.SelectListItem;
+import com.yiboshi.science.entity.*;
 import com.yiboshi.science.enumeration.CommonEnum;
 import com.yiboshi.science.param.dto.*;
 import com.yiboshi.science.param.query.ComProjectQueryVO;
@@ -18,6 +15,9 @@ import com.yiboshi.science.service.ComFileService;
 import com.yiboshi.science.service.ComProjectService;
 import com.yiboshi.science.service.ComProjectTaskService;
 import com.yiboshi.science.utils.*;
+import com.yiboshi.science.service.SystemParameterService;
+import com.yiboshi.science.utils.ProjectInfoToPDF;
+import com.yiboshi.science.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,19 +87,8 @@ public class ComProjectController extends BaseController<ComProjectService, ComP
     @ApiOperation(value = "项目信息导出", httpMethod = "POST", notes = "项目信息导出")
     @RequestMapping("/export/{id}")
     @PostMapping
-    public ResponseDataModel<byte[]> export(@PathVariable String id) {
-        try {
-            return ResponseDataModel.ok(PDF.createPDF(response,"tmp-report.html",new ComProjectDTO()));
-        } catch (Exception e) {
-            return new ResponseDataModel(ResponseCode.SERVER_ERROR, "");
-        }
-    }
-
-    @ApiOperation(value = "项目信息导出", httpMethod = "POST", notes = "项目信息导出")
-    @RequestMapping("/export1/{id}")
-    @PostMapping
-    public void export1(@PathVariable String id) {
-        comProjectService.export(id, request, response);
+    public void export(@PathVariable String id) {
+        comProjectService.export(id,request,response);
     }
 
     /**
@@ -171,7 +160,7 @@ public class ComProjectController extends BaseController<ComProjectService, ComP
     @PostMapping
     @RequestMapping("/audit")
     @Logs(value = CommonEnum.logType.projectAudit)
-    public ResponseDataModel<String> audit(@Validated @RequestBody ComProjectAuditDTO comProjectAudit, BindingResult bindingResult) {
+    public ResponseDataModel<String> audit(@Validated @RequestBody ComProjectAuditDTO comProjectAudit, BindingResult  bindingResult) {
         comProjectService.audit(comProjectAudit, SecurityUserHolder.getUnitId(), SecurityUserHolder.getUnitCode());
         return ResponseDataModel.ok("审核成功");
     }
@@ -231,5 +220,4 @@ public class ComProjectController extends BaseController<ComProjectService, ComP
         ProjectInfoToPDF.generateProjectPDF(dto, outputPath);
         return ResponseDataModel.ok("项目信息导入成功！");
     }
-
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/utils/DateUtils.java

@@ -16,4 +16,26 @@ public class DateUtils {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         return sdf.format(date);
     }
+
+    /**
+     * 格式化起止年限
+     * @param date 开始日期
+     * @return 格式化后的日期范围字符串
+     */
+    public static String formatDateRange(Date date, int type) {
+        // 定义日期格式
+        SimpleDateFormat sdf;
+        if (type == 1)
+            sdf = new SimpleDateFormat("yyyy年MM月");
+        else
+            sdf = new SimpleDateFormat("yyyy年MM月dd日");
+
+        return sdf.format(date);
+    }
+
+    public static int getDateYear(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date); // 将Date对象设置到Calendar对象中
+        return calendar.get(Calendar.YEAR);
+    }
 }