diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
index 68d140b..9a0f238 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
@@ -134,7 +134,7 @@ public class WProjectLibraryInventoryController extends BaseController<WProjectL
         for (WProjectLibraryInventory projectLibraryInventory : list) {
             HashMap<String, Object> mapSon = new HashMap<>();
             mapSon.put("projectNo", projectLibraryInventory.getFProjectNo());
-            mapSon.put("projectCompany", projectLibraryInventory.getfOrgName());
+            mapSon.put("projectCompany", projectLibraryInventory.getFOrgName());
             mapSon.put("warehouseEntryDate", ObjectUtils.isNotEmpty(projectLibraryInventory.getFWarehouseEntryDate()) ? projectLibraryInventory.getFWarehouseEntryDate().format(dateTimeFormatter) : "");
             mapSon.put("projectName", projectLibraryInventory.getFProjectName());
             mapSon.put("projectCategory", projectLibraryInventory.getFProjectCategory());
@@ -200,5 +200,21 @@ public class WProjectLibraryInventoryController extends BaseController<WProjectL
         return CommonResult.<Object>ok().value(baseService.statistics(startDate,endDate));
     }
 
+    @GetMapping(value = "/areaDataAnalysis")
+    @ApiOperation(value = "区域数据分析", httpMethod = "GET", notes = "区域数据分析")
+    public CommonResult<Object> areaDataAnalysis(@ApiParam(name = "startDate", value = "开始日期", required = true) @RequestParam(required = true) String startDate
+            , @ApiParam(name = "endDate", value = "结束日期", required = true) @RequestParam(required = true) String endDate
+            , @ApiParam(name = "type", value = "类型", required = true) @RequestParam(required = true) String type
+            , @ApiParam(name = "area", value = "区域", required = true) @RequestParam(required = true) String area) throws Exception {
+        return CommonResult.<Object>ok().value(baseService.areaDataAnalysis(startDate, endDate, type, area));
+    }
+
+    @GetMapping(value = "/areaData")
+    @ApiOperation(value = "区域数据", httpMethod = "GET", notes = "区域数据")
+    public CommonResult<Object> areaData(@ApiParam(name = "startDate", value = "开始日期", required = true) @RequestParam(required = true) String startDate
+            , @ApiParam(name = "endDate", value = "结束日期", required = true) @RequestParam(required = true) String endDate
+            ) throws Exception {
+        return CommonResult.<Object>ok().value(baseService.areaData(startDate, endDate));
+    }
 
 }
diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WProjectLibraryInventoryDao.java b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WProjectLibraryInventoryDao.java
index 7f51df2..9a71674 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WProjectLibraryInventoryDao.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WProjectLibraryInventoryDao.java
@@ -78,4 +78,11 @@ public interface WProjectLibraryInventoryDao extends BaseMapper<WProjectLibraryI
      * @return
      */
     List<HashMap<String, Object>> businessModelStatistics(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("list")ArrayList<String> orgIdList, @Param("swmsList")List<String> swmsList);
+
+    List<HashMap<String, Object>> areaDataAnalysis(@Param("startDate")String startDate, @Param("endDate")String endDate,@Param("type") String type,@Param("rq")List<String> rq,@Param("orgIdList")List<String> orgIdList,@Param("area")String area);
+
+    List<String> getRq(@Param("startDate")String startDate, @Param("endDate")String endDate,@Param("type") String type);
+
+    List<HashMap<String, Object>> areaData(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("orgIdList")ArrayList<String> orgIdList,@Param("areaList") ArrayList<String> areaList);
+
 }
diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WProjectLibraryInventoryManager.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WProjectLibraryInventoryManager.java
index 183a3ae..06d9f93 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WProjectLibraryInventoryManager.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/WProjectLibraryInventoryManager.java
@@ -4,6 +4,7 @@ import com.hotent.base.manager.BaseManager;
 import com.hotent.chkpower.model.WProjectLibraryInventory;
 
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * 项目库清单 服务类
@@ -30,4 +31,8 @@ public interface WProjectLibraryInventoryManager extends BaseManager<WProjectLib
     void createOrUpdate(WProjectLibraryInventory wProjectLibraryInventory);
 
     HashMap<String,Object> statistics(String startDate, String endDate);
+
+    HashMap<String,Object>  areaDataAnalysis(String startDate, String endDate,String type,String area);
+
+    List<HashMap<String,Object>> areaData(String startDate, String endDate);
 }
diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectLibraryInventoryManagerImpl.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectLibraryInventoryManagerImpl.java
index 7e39df0..b76bf82 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectLibraryInventoryManagerImpl.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectLibraryInventoryManagerImpl.java
@@ -1,19 +1,17 @@
 package com.hotent.chkpower.manager.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hotent.base.manager.impl.BaseManagerImpl;
 import com.hotent.chkpower.dao.WProjectLibraryInventoryDao;
 import com.hotent.chkpower.manager.WProjectLibraryInventoryManager;
 import com.hotent.chkpower.model.WProjectLibraryInventory;
 import com.hotent.runtime.script.ScriptImpl;
-import org.redisson.transaction.operation.map.MapPutIfAbsentOperation;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.Dictionary;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 
 
@@ -29,6 +27,8 @@ public class WProjectLibraryInventoryManagerImpl extends BaseManagerImpl<WProjec
 
     @Resource
     private ScriptImpl script;
+
+
     @Override
     public WProjectLibraryInventory getDetail(String id) {
         WProjectLibraryInventory wProjectLibraryInventory = this.get(id);
@@ -73,4 +73,49 @@ public class WProjectLibraryInventoryManagerImpl extends BaseManagerImpl<WProjec
         map.put("SWMSZB", swmszbMap);
         return map;
     }
+
+    @Override
+    public HashMap<String, Object> areaDataAnalysis(String startDate, String endDate, String type, String area) {
+        startDate += " 00:00:00";
+        endDate += " 23:59:59";
+        //获取当前用户所属组织及下属组织id集合
+        ArrayList<String> orgIdList = script.getDataPermission("loginUserAllSubOrgs");
+        HashMap<String, Object> map = new LinkedHashMap<>();
+        List<String> rq = baseMapper.getRq(startDate, endDate, type);
+        List<HashMap<String, Object>> resultList = baseMapper.areaDataAnalysis(startDate, endDate, type, rq, orgIdList, area);
+        ArrayList<String> type1 = new ArrayList<>();
+        ArrayList<String> type2 = new ArrayList<>();
+        ArrayList<String> type3 = new ArrayList<>();
+        for (int i = 0; i < rq.size(); i++) {
+            type1.add(String.valueOf(resultList.get(i).get("type1")));
+            type2.add(String.valueOf(resultList.get(i).get("type2")));
+            type3.add(String.valueOf(resultList.get(i).get("type3")));
+        }
+        ArrayList<String> rqformat = new ArrayList<>();
+        for (String day : rq) {
+            rqformat.add(day.replace("-", ""));
+        }
+        map.put("rq", rqformat);
+        map.put("type1", type1);
+        map.put("type2", type2);
+        map.put("type3", type3);
+        return map;
+    }
+
+    @Override
+    public List<HashMap<String,Object>> areaData(String startDate, String endDate) {
+        startDate += " 00:00:00";
+        endDate += " 23:59:59";
+        //获取当前用户所属组织及下属组织id集合
+        ArrayList<String> orgIdList = script.getDataPermission("loginUserAllSubOrgs");
+        ArrayList<String> areaList = new ArrayList<>();
+        areaList.add("华南");
+        areaList.add("华北");
+        areaList.add("华中");
+        areaList.add("华西");
+        areaList.add("南京");
+        areaList.add("华东");
+        List<HashMap<String,Object>> list = baseMapper.areaData(startDate,endDate,orgIdList,areaList);
+        return list;
+    }
 }
diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectOperationRecordManagerImpl.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectOperationRecordManagerImpl.java
index 8182cb7..07e3e87 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectOperationRecordManagerImpl.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectOperationRecordManagerImpl.java
@@ -76,6 +76,9 @@ public class WProjectOperationRecordManagerImpl extends BaseManagerImpl<WProject
             wProjectLibraryInventory.setFProjectState("已入库");
         } else if (EventTypeEnum.xiangmujinzhan.getCode().equals(eventTypeEnum.getCode())) {
             wProjectLibraryInventory.setFProjectDebriefing(wProjectLibraryInventory.getFProjectDebriefing() + "\n" + wProjectOperationRecord.getFProgressStatus());
+            if (ObjectUtils.isEmpty(wProjectOperationRecord.getfFile())) {
+                throw new RuntimeException("请上传附件");
+            }
         } else if (EventTypeEnum.chuku.getCode().equals(eventTypeEnum.getCode())) {
             wProjectLibraryInventory.setFProjectState("已出库");
         }
diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java b/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java
index fc689c2..200b405 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectLibraryInventory.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.hotent.base.entity.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -19,6 +20,7 @@ import java.util.ArrayList;
  * @company 广州宏天软件股份有限公司
  * @since 2024-07-12
  */
+@Data
 @ApiModel(value = "WProjectLibraryInventory对象", description = "项目库清单")
 public class WProjectLibraryInventory extends BaseModel<WProjectLibraryInventory> {
 
@@ -228,21 +230,51 @@ public class WProjectLibraryInventory extends BaseModel<WProjectLibraryInventory
     @JsonProperty("fOrgId")
     private String fOrgId;
 
-    public String getCreateTime() {
-        return createTime;
-    }
+    @ApiModelProperty(value = "公司类型")
+    @TableField("F_org_type")
+    @JsonProperty("fOrgType")
+    private String fOrgType;
 
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
+    @ApiModelProperty(value = "项目所属区域")
+    @TableField("F_project_area")
+    @JsonProperty("fProjectArea")
+    private String fProjectArea;
 
-    public String getUpdateTime() {
-        return updateTime;
-    }
+    @ApiModelProperty(value = "是否为本月重点推进项目")
+    @TableField("F_this_month_key_promoted")
+    @JsonProperty("fThisMonthKeyPromoted")
+    private String fThisMonthKeyPromoted;
+
+    @ApiModelProperty(value = "项目所在地省")
+    @TableField("F_project_province")
+    @JsonProperty("fProjectProvince")
+    private String fProjectProvince;
+
+    @ApiModelProperty(value = "项目所在地市")
+    @TableField("F_project_city")
+    @JsonProperty("fProjectCity")
+    private String fProjectCity;
+
+    @ApiModelProperty(value = "项目所在地区")
+    @TableField("F_project_district")
+    @JsonProperty("fProjectDistrict")
+    private String fProjectDistrict;
+
+    @ApiModelProperty(value = "客户类型")
+    @TableField("F_customer_type")
+    @JsonProperty("fCustomerType")
+    private String fCustomerType;
+
+    @ApiModelProperty(value = "推进月份")
+    @TableField("F_promoted_month")
+    @JsonProperty("fPromotedMonth")
+    private String fPromotedMonth;
+
+    @ApiModelProperty(value = "偏差分析附件")
+    @TableField("F_deviation_analysis_file")
+    @JsonProperty("fDeviationAnalysisFile")
+    private String fDeviationAnalysisFile;
 
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
-    }
 
     @TableField(exist = false)
     private String createTime;//查询条件：创建时间
@@ -253,402 +285,6 @@ public class WProjectLibraryInventory extends BaseModel<WProjectLibraryInventory
     @TableField(exist = false)
     private ArrayList<String> idList;//导出的数据id集合
 
-    public ArrayList<String> getIdList() {
-        return idList;
-    }
-
-    public void setIdList(ArrayList<String> idList) {
-        this.idList = idList;
-    }
-
-    public String getExportType() {
-        return exportType;
-    }
-
-    public void setExportType(String exportType) {
-        this.exportType = exportType;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getRefId() {
-        return refId;
-    }
-
-    public void setRefId(String refId) {
-        this.refId = refId;
-    }
-
-
-
-    public LocalDateTime getFWarehouseEntryDate() {
-        return fWarehouseEntryDate;
-    }
-
-    public void setFWarehouseEntryDate(LocalDateTime fWarehouseEntryDate) {
-        this.fWarehouseEntryDate = fWarehouseEntryDate;
-    }
-
-    public String getFProjectName() {
-        return fProjectName;
-    }
-
-    public void setFProjectName(String fProjectName) {
-        this.fProjectName = fProjectName;
-    }
-
-    public String getFProjectCategory() {
-        return fProjectCategory;
-    }
-
-    public void setFProjectCategory(String fProjectCategory) {
-        this.fProjectCategory = fProjectCategory;
-    }
-
-    public String getFBusinessScenarios() {
-        return fBusinessScenarios;
-    }
-
-    public void setFBusinessScenarios(String fBusinessScenarios) {
-        this.fBusinessScenarios = fBusinessScenarios;
-    }
-
-    public String getFSmartHeating() {
-        return fSmartHeating;
-    }
-
-    public void setFSmartHeating(String fSmartHeating) {
-        this.fSmartHeating = fSmartHeating;
-    }
-
-    public String getFEnergyEfficiency() {
-        return fEnergyEfficiency;
-    }
-
-    public void setFEnergyEfficiency(String fEnergyEfficiency) {
-        this.fEnergyEfficiency = fEnergyEfficiency;
-    }
-
-    public String getFPhotovoltaic() {
-        return fPhotovoltaic;
-    }
-
-    public void setFPhotovoltaic(String fPhotovoltaic) {
-        this.fPhotovoltaic = fPhotovoltaic;
-    }
-
-    public String getFEnergyStorage() {
-        return fEnergyStorage;
-    }
-
-    public void setFEnergyStorage(String fEnergyStorage) {
-        this.fEnergyStorage = fEnergyStorage;
-    }
-
-    public String getFProjectNature() {
-        return fProjectNature;
-    }
-
-    public void setFProjectNature(String fProjectNature) {
-        this.fProjectNature = fProjectNature;
-    }
-
-    public String getFBusinessModel() {
-        return fBusinessModel;
-    }
-
-    public void setFBusinessModel(String fBusinessModel) {
-        this.fBusinessModel = fBusinessModel;
-    }
-
-    public String getFInvestmentScale() {
-        return fInvestmentScale;
-    }
-
-    public void setFInvestmentScale(String fInvestmentScale) {
-        this.fInvestmentScale = fInvestmentScale;
-    }
-
-    public String getFProjectRating() {
-        return fProjectRating;
-    }
-
-    public void setFProjectRating(String fProjectRating) {
-        this.fProjectRating = fProjectRating;
-    }
-
-    public String getFStaticPaybackPeriod() {
-        return fStaticPaybackPeriod;
-    }
-
-    public void setFStaticPaybackPeriod(String fStaticPaybackPeriod) {
-        this.fStaticPaybackPeriod = fStaticPaybackPeriod;
-    }
-
-    public String getFCalculateIrr() {
-        return fCalculateIrr;
-    }
-
-    public void setFCalculateIrr(String fCalculateIrr) {
-        this.fCalculateIrr = fCalculateIrr;
-    }
-
-    public String getFAnnualIncomeForecast() {
-        return fAnnualIncomeForecast;
-    }
-
-    public void setFAnnualIncomeForecast(String fAnnualIncomeForecast) {
-        this.fAnnualIncomeForecast = fAnnualIncomeForecast;
-    }
-
-    public String getFAnnualNetProfitForecast() {
-        return fAnnualNetProfitForecast;
-    }
-
-    public void setFAnnualNetProfitForecast(String fAnnualNetProfitForecast) {
-        this.fAnnualNetProfitForecast = fAnnualNetProfitForecast;
-    }
-
-    public String getFTeamLeader() {
-        return fTeamLeader;
-    }
-
-    public void setFTeamLeader(String fTeamLeader) {
-        this.fTeamLeader = fTeamLeader;
-    }
-
-    public String getFTeamLeaderId() {
-        return fTeamLeaderId;
-    }
-
-    public void setFTeamLeaderId(String fTeamLeaderId) {
-        this.fTeamLeaderId = fTeamLeaderId;
-    }
-
-    public String getFTeamCollaborationPer() {
-        return fTeamCollaborationPer;
-    }
-
-    public void setFTeamCollaborationPer(String fTeamCollaborationPer) {
-        this.fTeamCollaborationPer = fTeamCollaborationPer;
-    }
-
-    public String getFTeamCollaborationPerId() {
-        return fTeamCollaborationPerId;
-    }
-
-    public void setFTeamCollaborationPerId(String fTeamCollaborationPerId) {
-        this.fTeamCollaborationPerId = fTeamCollaborationPerId;
-    }
-
-    public LocalDateTime getFExpectedSigningDate() {
-        return fExpectedSigningDate;
-    }
-
-    public void setFExpectedSigningDate(LocalDateTime fExpectedSigningDate) {
-        this.fExpectedSigningDate = fExpectedSigningDate;
-    }
-
-    public LocalDateTime getFExpectedScheduledDate() {
-        return fExpectedScheduledDate;
-    }
-
-    public void setFExpectedScheduledDate(LocalDateTime fExpectedScheduledDate) {
-        this.fExpectedScheduledDate = fExpectedScheduledDate;
-    }
-
-    public String getFStrategicValue() {
-        return fStrategicValue;
-    }
-
-    public void setFStrategicValue(String fStrategicValue) {
-        this.fStrategicValue = fStrategicValue;
-    }
-
-    public String getFProjectSource() {
-        return fProjectSource;
-    }
-
-    public void setFProjectSource(String fProjectSource) {
-        this.fProjectSource = fProjectSource;
-    }
-
-    public String getFCustomerContact() {
-        return fCustomerContact;
-    }
-
-    public void setFCustomerContact(String fCustomerContact) {
-        this.fCustomerContact = fCustomerContact;
-    }
-
-    public String getFProjectOverview() {
-        return fProjectOverview;
-    }
-
-    public void setFProjectOverview(String fProjectOverview) {
-        this.fProjectOverview = fProjectOverview;
-    }
-
-    public String getFProjectDebriefing() {
-        return fProjectDebriefing;
-    }
-
-    public void setFProjectDebriefing(String fProjectDebriefing) {
-        this.fProjectDebriefing = fProjectDebriefing;
-    }
-
-    public String getFDeviationAnalysis() {
-        return fDeviationAnalysis;
-    }
-
-    public void setFDeviationAnalysis(String fDeviationAnalysis) {
-        this.fDeviationAnalysis = fDeviationAnalysis;
-    }
-
-    public String getFProjectState() {
-        return fProjectState;
-    }
-
-    public void setFProjectState(String fProjectState) {
-        this.fProjectState = fProjectState;
-    }
-
-    public String getFCreateBy() {
-        return fCreateBy;
-    }
-
-    public String getfOrgName() {
-        return fOrgName;
-    }
-
-    @Override
-    public String toString() {
-        return "WProjectLibraryInventory{" +
-                "id='" + id + '\'' +
-                ", refId='" + refId + '\'' +
-                ", fOrgName='" + fOrgName + '\'' +
-                ", fWarehouseEntryDate=" + fWarehouseEntryDate +
-                ", fProjectName='" + fProjectName + '\'' +
-                ", fProjectCategory='" + fProjectCategory + '\'' +
-                ", fBusinessScenarios='" + fBusinessScenarios + '\'' +
-                ", fSmartHeating='" + fSmartHeating + '\'' +
-                ", fEnergyEfficiency='" + fEnergyEfficiency + '\'' +
-                ", fPhotovoltaic='" + fPhotovoltaic + '\'' +
-                ", fEnergyStorage='" + fEnergyStorage + '\'' +
-                ", fProjectNature='" + fProjectNature + '\'' +
-                ", fBusinessModel='" + fBusinessModel + '\'' +
-                ", fInvestmentScale='" + fInvestmentScale + '\'' +
-                ", fProjectRating='" + fProjectRating + '\'' +
-                ", fStaticPaybackPeriod='" + fStaticPaybackPeriod + '\'' +
-                ", fCalculateIrr='" + fCalculateIrr + '\'' +
-                ", fAnnualIncomeForecast='" + fAnnualIncomeForecast + '\'' +
-                ", fAnnualNetProfitForecast='" + fAnnualNetProfitForecast + '\'' +
-                ", fTeamLeader='" + fTeamLeader + '\'' +
-                ", fTeamLeaderId='" + fTeamLeaderId + '\'' +
-                ", fTeamCollaborationPer='" + fTeamCollaborationPer + '\'' +
-                ", fTeamCollaborationPerId='" + fTeamCollaborationPerId + '\'' +
-                ", fExpectedSigningDate=" + fExpectedSigningDate +
-                ", fExpectedScheduledDate=" + fExpectedScheduledDate +
-                ", fStrategicValue='" + fStrategicValue + '\'' +
-                ", fProjectSource='" + fProjectSource + '\'' +
-                ", fCustomerContact='" + fCustomerContact + '\'' +
-                ", fProjectOverview='" + fProjectOverview + '\'' +
-                ", fProjectDebriefing='" + fProjectDebriefing + '\'' +
-                ", fDeviationAnalysis='" + fDeviationAnalysis + '\'' +
-                ", fProjectState='" + fProjectState + '\'' +
-                ", fCreateBy='" + fCreateBy + '\'' +
-                ", fCreateById='" + fCreateById + '\'' +
-                ", fCreateTime=" + fCreateTime +
-                ", fUpdateBy='" + fUpdateBy + '\'' +
-                ", fUpdateById='" + fUpdateById + '\'' +
-                ", fUpdateTime=" + fUpdateTime +
-                ", fFormDataRev=" + fFormDataRev +
-                ", fProjectNo='" + fProjectNo + '\'' +
-                ", fOrgId='" + fOrgId + '\'' +
-                ", createTime='" + createTime + '\'' +
-                ", updateTime='" + updateTime + '\'' +
-                '}';
-    }
-
-    public void setfOrgName(String fOrgName) {
-        this.fOrgName = fOrgName;
-    }
-
-    public void setFCreateBy(String fCreateBy) {
-        this.fCreateBy = fCreateBy;
-    }
-
-    public String getFCreateById() {
-        return fCreateById;
-    }
-
-    public void setFCreateById(String fCreateById) {
-        this.fCreateById = fCreateById;
-    }
-
-    public LocalDateTime getFCreateTime() {
-        return fCreateTime;
-    }
-
-    public void setFCreateTime(LocalDateTime fCreateTime) {
-        this.fCreateTime = fCreateTime;
-    }
-
-    public String getFUpdateBy() {
-        return fUpdateBy;
-    }
-
-    public void setFUpdateBy(String fUpdateBy) {
-        this.fUpdateBy = fUpdateBy;
-    }
-
-    public String getFUpdateById() {
-        return fUpdateById;
-    }
-
-    public void setFUpdateById(String fUpdateById) {
-        this.fUpdateById = fUpdateById;
-    }
-
-    public LocalDateTime getFUpdateTime() {
-        return fUpdateTime;
-    }
-
-    public void setFUpdateTime(LocalDateTime fUpdateTime) {
-        this.fUpdateTime = fUpdateTime;
-    }
-
-    public Long getFFormDataRev() {
-        return fFormDataRev;
-    }
-
-    public void setFFormDataRev(Long fFormDataRev) {
-        this.fFormDataRev = fFormDataRev;
-    }
-
-    public String getFProjectNo() {
-        return fProjectNo;
-    }
-
-    public void setFProjectNo(String fProjectNo) {
-        this.fProjectNo = fProjectNo;
-    }
-
-    public String getFOrgId() {
-        return fOrgId;
-    }
-
-    public void setFOrgId(String fOrgId) {
-        this.fOrgId = fOrgId;
-    }
-
-
     @Override
     protected Serializable pkVal() {
         return this.id;
diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectOperationRecord.java b/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectOperationRecord.java
index 00a2eef..12cf3aa 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectOperationRecord.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/model/WProjectOperationRecord.java
@@ -67,6 +67,21 @@ public class WProjectOperationRecord extends BaseModel<WProjectOperationRecord> 
     @JsonProperty("fFormDataRev")
     private Long fFormDataRev;
 
+    @ApiModelProperty(value = "附件")
+    @TableField("F_file")
+    @JsonProperty("fFile")
+    private String fFile;
+
+
+
+    public String getfFile() {
+        return fFile;
+    }
+
+    public void setfFile(String fFile) {
+        this.fFile = fFile;
+    }
+
 
     public String getId() {
         return id;
diff --git a/backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml b/backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml
index 357bdf2..adad2e1 100644
--- a/backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml
+++ b/backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml
@@ -45,11 +45,69 @@
         <result column="F_form_data_rev_" property="fFormDataRev"/>
         <result column="F_project_no" property="fProjectNo"/>
         <result column="F_org_id" property="fOrgId"/>
+        <result column="F_org_type" property="fOrgType"/>
+        <result column="F_project_area" property="fProjectArea"/>
+        <result column="F_this_month_key_promoted" property="fThisMonthKeyPromoted"/>
+        <result column="F_project_province" property="fProjectProvince"/>
+        <result column="F_project_city" property="fProjectCity"/>
+        <result column="F_project_district" property="fProjectDistrict"/>
+        <result column="F_customer_type" property="fCustomerType"/>
+        <result column="F_promoted_month" property="fPromotedMonth"/>
+        <result column="F_deviation_analysis_file" property="fDeviationAnalysisFile"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID_, REF_ID_, F_org_name, F_warehouse_entry_date, F_project_name, F_project_category, F_business_scenarios, F_smart_heating, F_energy_efficiency, F_photovoltaic, F_energy_storage, F_project_nature, F_business_model, F_investment_scale, F_project_rating, F_static_payback_period, F_calculate_IRR, F_annual_income_forecast, F_annual_net_profit_forecast, F_team_leader, F_team_leader_id, F_team_collaboration_per, F_team_collaboration_per_id, F_expected_signing_date, F_expected_scheduled_date, F_strategic_value, F_project_source, F_customer_contact, F_project_overview, F_project_debriefing, F_deviation_analysis, F_project_state, F_create_by, F_create_by_id, F_create_time, F_update_by, F_update_by_id, F_update_time, F_form_data_rev_, F_project_no, F_org_id
+        ID_,
+        REF_ID_,
+        F_org_name,
+        F_warehouse_entry_date,
+        F_project_name,
+        F_project_category,
+        F_business_scenarios,
+        F_smart_heating,
+        F_energy_efficiency,
+        F_photovoltaic,
+        F_energy_storage,
+        F_project_nature,
+        F_business_model,
+        F_investment_scale,
+        F_project_rating,
+        F_static_payback_period,
+        F_calculate_IRR,
+        F_annual_income_forecast,
+        F_annual_net_profit_forecast,
+        F_team_leader,
+        F_team_leader_id,
+        F_team_collaboration_per,
+        F_team_collaboration_per_id,
+        F_expected_signing_date,
+        F_expected_scheduled_date,
+        F_strategic_value,
+        F_project_source,
+        F_customer_contact,
+        F_project_overview,
+        F_project_debriefing,
+        F_deviation_analysis,
+        F_project_state,
+        F_create_by,
+        F_create_by_id,
+        F_create_time,
+        F_update_by,
+        F_update_by_id,
+        F_update_time,
+        F_form_data_rev_,
+        F_project_no,
+        F_org_id,
+        F_org_type,
+        F_project_area,
+        F_this_month_key_promoted,
+        F_project_province,
+        F_project_city,
+        F_project_district,
+        F_customer_type,
+        F_promoted_month,
+        F_deviation_analysis_file
     </sql>
 
     <select id="selectPage" resultMap="BaseResultMap">
@@ -81,16 +139,20 @@
 
     <select id="basicsStatistics" resultType="java.util.HashMap">
         SELECT
-            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '已通过投评项目' THEN 1 ELSE 0 END ),0) AS YTGTPXMS, -- 已通过投评项目
-            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '已签约项目' THEN 1 ELSE 0 END ),0) AS YQYXMS, -- 已签约项目
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '商机阶段' THEN 1 ELSE 0 END ),0) AS SJJD, -- 商机阶段
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '前期开发阶段' THEN 1 ELSE 0 END ),0) AS QQKFJD, -- 前期开发阶段
             IFNULL(ROUND(SUM(F_ANNUAL_INCOME_FORECAST/10000),2),0.00) AS YJZNSR,	-- 预计总年收入(亿元)
             IFNULL(ROUND(SUM(F_ANNUAL_NET_PROFIT_FORECAST/10000),2),0.00) AS YJZNLR, -- 预计总年利润(亿元)
 
 
             COUNT(*) AS XMZS, -- 项目总数
-            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '暂缓项目' THEN 1 ELSE 0 END ),0) AS ZHXMS, -- 暂缓项目
-            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '出库项目' THEN 1 ELSE 0 END ),0) AS CKXMS, -- 出库项目数
-            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '本月重点推进项目' THEN 1 ELSE 0 END ),0) AS BYZDTJXMS, -- 本月重点推进项目
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '通过事业部投评阶段' THEN 1 ELSE 0 END ),0) AS TGSYBTPJD, -- 通过事业部投评阶段
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '通过集团过会阶段' THEN 1 ELSE 0 END ),0) AS TGJTGHJD, -- 通过集团过会阶段
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '签约阶段' THEN 1 ELSE 0 END ),0) AS QYJD, -- 签约阶段
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '项目建设阶段' THEN 1 ELSE 0 END ),0) AS XMJSJD, -- 项目建设阶段
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '项目运营阶段' THEN 1 ELSE 0 END ),0) AS XMYYJD, -- 项目运营阶段
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '项目暂缓' THEN 1 ELSE 0 END ),0) AS ZHXM, -- 项目暂缓
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '项目出库' THEN 1 ELSE 0 END ),0) AS CKXM, -- 项目出库
             IFNULL(ROUND(SUM(F_INVESTMENT_SCALE/10000),2),0.00) AS YJZTZ, -- 预计总投资（亿元）
 
 
@@ -160,8 +222,8 @@
 
     <select id="orgNameProjectStatistics" resultType="java.util.HashMap">
         SELECT
-            F_org_name AS xmzt,
-            count( F_org_id ) AS sl
+            F_project_area AS xmzt,
+            count( F_project_area ) AS sl
         FROM
             W_PROJECT_LIBRARY_INVENTORY
         WHERE
@@ -176,7 +238,7 @@
                 </foreach>
             </if>
         GROUP BY
-            F_org_id
+        F_project_area
     </select>
 
     <select id="listDictByKey" resultType="java.lang.String">
@@ -235,4 +297,133 @@
         </if>
         GROUP BY temp1.business_model
     </select>
+
+    <select id="areaDataAnalysis" resultType="java.util.HashMap">
+        select
+        temp1.day,
+        IFNULL(temp2.type1,0) as type1,
+        IFNULL(temp2.type2,0) as type2,
+        IFNULL(temp2.type3,0) as type3
+        from
+        (
+            select
+            <foreach collection="rq" item="item" separator="union all select ">
+                #{item} as day
+            </foreach>
+        ) temp1
+        left join
+        (
+        select
+        F_project_area,
+        DATE_FORMAT(F_create_time,'%Y-%m-%d') as sj,
+        IFNULL(sum(case when F_project_category = '商机阶段' then 1 else 0 end ),0) as type1,
+        IFNULL(sum(case when F_project_category = '通过事业部投评阶段' then 1 else 0 end ),0) as type2,
+        IFNULL(sum(case when F_project_category = '通过集团过会阶段' then 1 else 0 end ),0) as type3
+        from w_project_library_inventory
+        where F_create_time BETWEEN #{startDate} and #{endDate}
+        and F_project_area = #{area}
+        and F_project_state != '已作废'
+        and F_org_id IN
+        <foreach collection="orgIdList" separator="," item="orgId" open="(" close=")">
+            #{orgId}
+        </foreach>
+        group by DATE_FORMAT(F_create_time,'%Y-%m-%d')
+        ) temp2 on temp1.day = temp2.sj order by temp1.day asc
+    </select>
+
+   <!-- <select id="getRq" resultType="java.lang.String">
+         SELECT
+         <if test="type == '1'.toString()">
+             DATE_FORMAT(DATE_COLUMN, '%Y-%m-%d') AS DATE
+         </if>
+         <if test="type == '2'.toString()">
+            WEEK(DATE_COLUMN) AS DATE
+         </if>
+         <if test="type == '3'.toString()">
+            MONTH(DATE_COLUMN) AS DATE
+         </if>
+        FROM
+          (
+            SELECT
+              @ROW := @ROW + 1 AS ROWNUM,
+              DATE_COLUMN
+            FROM
+              (SELECT @ROW := -1) R,
+              (
+                SELECT
+                  DATE(#{startDate}) + INTERVAL (T1.I + (T2.I * 10) + (T3.I * 100)) DAY AS DATE_COLUMN
+                FROM
+                  (SELECT 0 AS I UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) T1,
+                  (SELECT 0 AS I UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) T2,
+                  (SELECT 0 AS I UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) T3
+              )
+            WHERE
+              DATE_COLUMN BETWEEN #{startDate} AND #{endDate}
+          ) AS SUBQUERY
+            <if test="type == '1'.toString()">
+                GROUP BY DATE_FORMAT(DATE_COLUMN, '%Y-%m-%d')
+            </if>
+            <if test="type == '2'.toString()">
+                GROUP BY WEEK(DATE_COLUMN)
+            </if>
+            <if test="type == '3'.toString()">
+                GROUP BY MONTH(DATE_COLUMN)
+            </if>
+    </select>-->
+
+    <select id="getRq" resultType="java.lang.String">
+            SELECT
+            date_format(#{startDate} + INTERVAL (t3.dateStr * 100 + t2.dateStr * 10 + t1.dateStr) day,'%Y-%m-%d') as dateStr
+            FROM
+            (SELECT 0 dateStr UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) t1,
+            (SELECT 0 dateStr UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) t2,
+            (SELECT 0 dateStr UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) t3
+            WHERE
+            (date_format(#{startDate} + INTERVAL (t3.dateStr * 100 + t2.dateStr * 10 + t1.dateStr) day ,'%Y-%m-%d')) &lt;= date_format(#{endDate},'%Y-%m-%d')
+    </select>
+
+    <select id="areaData" resultType="java.util.HashMap">
+        select
+        temp1.area,
+        ifnull(temp2.xmzs,0) as xmzs,
+        ifnull(temp2.sjjd,0) as sjjd,
+        ifnull(temp2.qqkfjd,0) as qqkfjd,
+        ifnull(temp2.tgsybtpjd,0) as tgsybtpjd,
+        ifnull(temp2.tgjtghjd,0) as tgjtghjd,
+        ifnull(temp2.qyjd,0) as qyjd,
+        ifnull(temp2.xmjsjd,0) as xmjsjd,
+        ifnull(temp2.xmyyjd,0) as xmyyjd,
+        ifnull(temp2.xmzh,0) as xmzh,
+        ifnull(temp2.xmck,0) as xmck
+        from (
+        select
+        <foreach collection="areaList" separator="union all select " item="area">
+            #{area} as area
+        </foreach>
+        ) temp1
+        left join
+        (
+        select
+        F_project_area as projectArea,
+        count(*) as xmzs,
+        ifnull(sum(case when F_project_category = '商机阶段' then 1 else 0 end ),0) as sjjd,
+        ifnull(sum(case when F_project_category = '前期开发阶段' then 1 else 0 end ),0) as qqkfjd,
+        ifnull(sum(case when F_project_category = '通过事业部投评阶段' then 1 else 0 end ),0) as tgsybtpjd,
+        ifnull(sum(case when F_project_category = '通过集团过会阶段' then 1 else 0 end ),0) as tgjtghjd,
+        ifnull(sum(case when F_project_category = '签约阶段' then 1 else 0 end ),0) as qyjd,
+        ifnull(sum(case when F_project_category = '项目建设阶段' then 1 else 0 end ),0) as xmjsjd,
+        ifnull(sum(case when F_project_category = '项目运营阶段' then 1 else 0 end ),0) as xmyyjd,
+        ifnull(sum(case when F_project_category = '项目暂缓' then 1 else 0 end ),0) as xmzh,
+        ifnull(sum(case when F_project_category = '项目出库' then 1 else 0 end ),0) as xmck
+        from w_project_library_inventory
+        where F_project_state != '已作废' and F_create_time BETWEEN #{startDate} and #{endDate}
+        and F_org_id in
+        <foreach collection="orgIdList" open="(" close=")" item="orgId" separator=",">
+            #{orgId}
+        </foreach>
+        group by F_project_area
+        )temp2
+        on temp1.area = temp2.projectArea
+        order by temp1.area
+    </select>
 </mapper>
diff --git a/backend/chkpower/src/main/resources/mapper/WProjectOperationRecordMapper.xml b/backend/chkpower/src/main/resources/mapper/WProjectOperationRecordMapper.xml
index 3207c3c..dae8624 100644
--- a/backend/chkpower/src/main/resources/mapper/WProjectOperationRecordMapper.xml
+++ b/backend/chkpower/src/main/resources/mapper/WProjectOperationRecordMapper.xml
@@ -13,11 +13,12 @@
         <result column="F_event_type" property="fEventType"/>
         <result column="F_progress_status" property="fProgressStatus"/>
         <result column="F_form_data_rev_" property="fFormDataRev"/>
+        <result column="F_file" property="fFile"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID_, REF_ID_, F_project_id, F_create_by, F_create_by_id, F_create_time, F_event_type, F_progress_status, F_form_data_rev_
+        ID_, REF_ID_, F_project_id, F_create_by, F_create_by_id, F_create_time, F_event_type, F_progress_status, F_form_data_rev_,F_file
     </sql>
 
     <select id="selectPage" resultMap="BaseResultMap">
--
libgit2 0.21.2