fix 合同管理导出

chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/ProjectContractExportVO.java

@@ -0,0 +1,28 @@
+package com.chushang.inspection.project.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+
+@Data
+public class ProjectContractExportVO implements java.io.Serializable{
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @ExcelProperty(value = "项目名称", index = 0)
+    private String projectName;
+    @ExcelProperty(value = "所属部门", index = 1)
+    private String deptName;
+    @ExcelProperty(value = "项目负责人", index = 2)
+    private String projectConcat;
+    @ExcelProperty(value = "项目负责人电话", index = 3)
+    private String projectPhone;
+    @ExcelProperty(value = "项目审核状态", index = 4)
+    private String auditStatus;
+    @ExcelProperty(value = "项目合同时间", index = 5)
+    private String contractTimes;
+    @ExcelProperty(value = "创建时间", index = 6)
+    private LocalDateTime createTime;
+}

chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java

@@ -218,6 +218,24 @@ public class WrkProjectController {
 
     }
 
+    @SysLog(value = "合同数据导出", businessType = BusinessType.EXPORT)
+    @GetMapping("/contract/data/export")
+    @RequiresPermissions("inspection:contract:export")
+    public void projectContractDataExport(HttpServletResponse response, ProjectQuery query) {
+        try {
+            log.info("开始导出项目合同数据。查询参数: {}", query);
+
+            projectService.exportDispatchPage2(response, query);
+            log.info("项目合同数据导出成功。");
+
+        } catch (Exception e) {
+            log.error("导出项目合同数据时发生错误", e);
+            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        }
+
+    }
+
+
     /**
      * 人工数据
      */

chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java

@@ -1,13 +1,11 @@
 package com.chushang.inspection.project.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chushang.inspection.project.po.WrkProject;
-import com.chushang.inspection.project.po.WrkProjectContract;
 import com.chushang.inspection.project.query.ProjectQuery;
+import com.chushang.inspection.project.vo.ProjectContractExportVO;
 import com.chushang.inspection.project.vo.ProjectExportVO;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -18,4 +16,6 @@ import java.util.List;
 public interface WrkProjectMapper extends BaseMapper<WrkProject> {
 
     List<ProjectExportVO> exportDispatchPage(@Param("query") ProjectQuery query);
+
+    List<ProjectContractExportVO> exportDispatchPage2(ProjectQuery query);
 }

chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java

@@ -21,10 +21,7 @@ import com.chushang.inspection.project.dto.ContractDTO;
 import com.chushang.inspection.project.dto.ProjectDTO;
 import com.chushang.inspection.project.po.WrkProjectContract;
 import com.chushang.inspection.project.query.ProjectQuery;
-import com.chushang.inspection.project.vo.CountVO;
+import com.chushang.inspection.project.vo.*;
-import com.chushang.inspection.project.vo.EmployeeVO;
-import com.chushang.inspection.project.vo.ProjectExportVO;
-import com.chushang.inspection.project.vo.ProjectVO;
 import com.chushang.inspection.terminal.service.StoreService;
 import com.chushang.inspection.terminal.service.TerminalService;
 import com.chushang.inspection.terminal.vo.FiveStoreVO;
@@ -449,4 +446,19 @@ public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject>
         }
         ExcelUtils.exportList(response, ProjectExportVO.class, records, "导出");
     }
+
+    public void exportDispatchPage2(HttpServletResponse response, ProjectQuery query) {
+        WrapperUtils.buildSql(query);
+        List<ProjectContractExportVO> records = baseMapper.exportDispatchPage2(query);
+        for (ProjectContractExportVO record : records) {
+            if(record.getAuditStatus().equals("1")||record.getAuditStatus()=="1"){
+                record.setAuditStatus("待审核");
+            }else if (record.getAuditStatus().equals("2")||record.getAuditStatus()=="2"){
+                record.setAuditStatus("审核成功");
+            } else if (record.getAuditStatus().equals("3")||record.getAuditStatus()=="3") {
+                record.setAuditStatus("审核拒绝");
+            }
+        }
+        ExcelUtils.exportList(response, ProjectContractExportVO.class, records, "导出");
+    }
 }

chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectMapper.xml

@@ -5,5 +5,17 @@
     <select id="exportDispatchPage" resultType="com.chushang.inspection.project.vo.ProjectExportVO">
         select project_name,dept_name,project_concat,project_phone,create_time,project_effect from wrk_project where del_state = 0
     </select>
-<!--    project_name,dept_name-->
+    <select id="exportDispatchPage2" resultType="com.chushang.inspection.project.vo.ProjectContractExportVO">
+        select
+            wp.project_name,
+            wp.dept_name,
+            wp.project_concat,
+            wp.project_phone,
+            wpc.audit_status,
+            CONCAT(contract_start_time,'-',contract_end_time) as contractTimes,
+                wp.create_time
+        from wrk_project wp
+                 left join wrk_project_contract wpc on wp.project_id = wpc.project_id
+        where wp.del_state = 0
+    </select>
 </mapper>