会计项目excel导入

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/controller/CwProjectRecordsController.java

@@ -445,13 +445,13 @@ public class CwProjectRecordsController {
 
 
     /**
-     * 导入发票数据
+     * 导入项目数据excel
      *
      * @return
      */
     @DemoMode
     @PostMapping("/importProjectRecords")
-    @ApiLog(value = "导入发票数据excel", type = LogTypeEnum.IMPORT)
+    @ApiLog(value = "导入项目数据excel", type = LogTypeEnum.IMPORT)
     public ResponseEntity importProjectRecords(MultipartFile file, HttpServletRequest request) throws IOException {
 
 
@@ -485,7 +485,8 @@ public class CwProjectRecordsController {
             }
         });
 
-        return cwFinanceImportDTOS;
+        //return cwFinanceImportDTOS;
+        return cwProjectRecordsImportDTOS;
     }
 
     public static boolean objectCheckIsNull(Object object) {

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwProjectRecordsMapper.java

@@ -117,5 +117,5 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
 
     List<CwProjectRecordsDTO> selectProjectListByName(@Param("userId") String userId, @Param("projectName")String projectName);
 
-    List<CwProjectRecordsDTO> getByProjectNameList(@Param("projectNameList") List<String> projectNameList);
+    List<CwProjectRecordsDTO> getByProjectNameList(@Param("projectNameList") List<String> projectNameList,@Param("userId") String userId);
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -817,5 +817,4 @@
         ORDER BY a.create_time DESC
     </select>
 
-
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/dto/CwProjectRecordsImportDTO.java

@@ -1,13 +1,16 @@
 package com.jeeplus.finance.projectRecords.service.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.service.dto.BaseDTO;
+import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author: 徐滕
@@ -37,7 +40,7 @@ public class CwProjectRecordsImportDTO extends BaseDTO {
     /**
      * 项目规模
      */
-    @Excel(name = "*项目规模",width = 25)
+    @Excel(name = "*项目规模（元）",width = 25)
     @NotNull(message="项目规模不可为空")
     private String projectMoney;
 
@@ -65,7 +68,7 @@ public class CwProjectRecordsImportDTO extends BaseDTO {
     /**
      * 项目计划开始时间
      */
-    @Excel(name = "*项目计划开始时间",width = 50)
+    @Excel(name = "*项目预计开始时间",width = 50)
     @NotNull(message="项目计划开始时间不可为空")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -74,7 +77,7 @@ public class CwProjectRecordsImportDTO extends BaseDTO {
     /**
      * 项目计划结束时间
      */
-    @Excel(name = "*项目计划结束时间",width = 50)
+    @Excel(name = "*项目预计结束时间",width = 50)
     @NotNull(message="项目计划结束时间不可为空")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -89,34 +92,33 @@ public class CwProjectRecordsImportDTO extends BaseDTO {
     /**
      * 项目经理1
      */
-    @Excel(name = "*项目经理1",width = 50)
+    @Excel(name = "项目经理1",width = 50)
     private String projectMasterId;
 
     /**
      * 项目经理2
      */
-    @Excel(name = "*项目经理2",width = 50)
+    @Excel(name = "项目经理2",width = 50)
     private String realHeader;
 
     /**
      * 客户姓名
      */
-    @Excel(name = "*客户姓名",width = 50)
+    @Excel(name = "*客户联系人-姓名",width = 50)
     @NotNull(message="客户姓名不可为空")
     private String cwProjectClientName;
 
     /**
      * 客户部门
      */
-    @Excel(name = "*客户部门",width = 50)
+    @Excel(name = "*客户联系人-部门",width = 50)
     @NotNull(message="客户部门不可为空")
     private String cwProjectClientOffice;
 
     /**
      * 客户手机号
      */
-    @Excel(name = "*客户手机号",width = 50)
-    @NotNull(message="客户手机号不可为空")
+    @Excel(name = "*客户联系人-联系方式1",width = 50)
+    @NotNull(message="客户联系方式不可为空")
     private String cwProjectClientPhone;
-
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/CwWorkClientBaseMapper.java

@@ -60,6 +60,8 @@ public interface CwWorkClientBaseMapper extends BaseMapper<CwWorkClientBase> {
     List<CwWorkClientBillingDTO> getBilling(@Param("id") String id);
 
     List<CwWorkClientBaseDTO> getList(@Param("clientList") ArrayList<String> clientList);
+
+    List<CwWorkClientBaseDTO> getContractClient(@Param("contractName") String contractName);
 }
 
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/mapper/xml/CwWorkClientBaseMapper.xml

@@ -421,4 +421,17 @@
 
 
     </select>
+
+
+    <select id="getContractClient" resultType="com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO">
+        SELECT
+        a.id,
+        a.name
+        FROM
+        cw_work_client_base a
+        WHERE
+        a.id = ( SELECT client_contacts FROM cw_work_contract_info WHERE contract_name = #{contractName}  )
+        and
+        a.del_flag = 0
+    </select>
 </mapper>