修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java

@@ -319,8 +319,8 @@ public class ProjectController {
 
     //分页查询客户项目统计报表
     @RequestMapping("/getCustomerProjectInAndOut")
-    public HttpRespMsg getCustomerProjectInAndOut(@RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        return projectService.getCustomerProjectInAndOut(pageIndex, pageSize, request);
+    public HttpRespMsg getCustomerProjectInAndOut(@RequestParam Integer pageIndex, @RequestParam Integer pageSize,Integer customerId,Integer projectId) {
+        return projectService.getCustomerProjectInAndOut(pageIndex, pageSize, request,customerId,projectId);
     }
     //导出项目收支平衡表
     @RequestMapping("/exportCustomerProjectInAndOut")

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ProjectRequirement.java

@@ -1,5 +1,6 @@
 package com.management.platform.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -42,12 +43,12 @@ public class ProjectRequirement extends Model<ProjectRequirement> {
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @TableField("start_date")
+    @TableField(fill = FieldFill.UPDATE)
     private Date startDate;
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @TableField("end_date")
+    @TableField(fill = FieldFill.UPDATE)
     private Date endDate;
 
     @TableField(exist = false)

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectMapper.java

@@ -50,9 +50,9 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     List<Project> getProjectInAndOut(Integer companyId, Integer pageStart, Integer pageSize, Integer projectId);
 
-    List<CustomerProject> getCustomerProjectInAndOut(Integer companyId, Integer pageStart, Integer pageSize);
+    List<CustomerProject> getCustomerProjectInAndOut(Integer companyId, Integer pageStart, Integer pageSize,Integer customerId,Integer projectId);
 
-    Integer getCustomerProjectInAndOutCount(Integer companyId);
+    Integer getCustomerProjectInAndOutCount(Integer companyId,Integer customerId,Integer projectId);
 
     List<CustomerProject> getProjectInAndOutByRange(Integer companyId, List<Integer> ids);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectService.java

@@ -84,7 +84,7 @@ public interface ProjectService extends IService<Project> {
 
     HttpRespMsg importData(String userId, MultipartFile file, HttpServletRequest request);
 
-    HttpRespMsg getCustomerProjectInAndOut(Integer pageIndex, Integer pageSize, HttpServletRequest request);
+    HttpRespMsg getCustomerProjectInAndOut(Integer pageIndex, Integer pageSize, HttpServletRequest request,Integer customerId,Integer projectId);
 
     HttpRespMsg exportCustomerProjectInAndOut(HttpServletRequest request);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -1315,13 +1315,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg getCustomerProjectInAndOut(Integer pageIndex, Integer pageSize, HttpServletRequest request) {
+    public HttpRespMsg getCustomerProjectInAndOut(Integer pageIndex, Integer pageSize, HttpServletRequest request,Integer customerId,Integer projectId) {
         User user = userMapper.selectById(request.getHeader("Token"));
         Integer companyId = user.getCompanyId();
 
-        int total = projectMapper.getCustomerProjectInAndOutCount(companyId);
+        int total = projectMapper.getCustomerProjectInAndOutCount(companyId,customerId,projectId);
         int pageStart = (pageIndex -1) * pageSize;
-        List<CustomerProject> list = projectMapper.getCustomerProjectInAndOut(companyId, pageStart, pageSize);
+        List<CustomerProject> list = projectMapper.getCustomerProjectInAndOut(companyId, pageStart, pageSize,customerId,projectId);
         list.forEach(data->{
             List<Integer> integers = ListUtil.convertIntegerIdsArrayToList(data.getProjectIds());
             data.setChildren(projectMapper.getProjectInAndOutByRange(companyId, integers));
@@ -1381,7 +1381,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         User user = userMapper.selectById(request.getHeader("Token"));
         Integer companyId = user.getCompanyId();
 
-        List<CustomerProject> projectList = projectMapper.getCustomerProjectInAndOut(companyId, null, null);
+        List<CustomerProject> projectList = projectMapper.getCustomerProjectInAndOut(companyId, null, null,null,null);
         List<List<String>> exportList = new ArrayList<>();
         String[] titles = {"客户名称", "相关项目", "合同金额", "人工成本", "一般费用", "差旅费用","外包费用", "总费用", "利润", "利润率"};
         exportList.add(Lists.list(titles));

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -333,6 +333,12 @@
         SUM((SELECT IFNULL(SUM(amount),0) FROM expense_item , expense_sheet WHERE project_id = project.id AND  expense_sheet.id = expense_item.`expense_id` AND expense_sheet.type = 2 and expense_sheet.status = 0)) AS fee_outsourcing
         FROM project WHERE project.`company_id` = #{companyId} AND customer_id > 0
         AND (project.status <> 3 OR project.status IS NULL)
+        <if test="customerId!=null">
+            and project.customer_id=#{customerId}
+        </if>
+        <if test="projectId!=null">
+            and project.id=#{projectId}
+        </if>
         GROUP BY customer_id
         <if test="pageStart != null and pageSize != null">
             LIMIT #{pageStart},#{pageSize}
@@ -342,6 +348,12 @@
     <select id="getCustomerProjectInAndOutCount" resultType="java.lang.Integer">
         SELECT COUNT(DISTINCT customer_id) FROM project WHERE project.`company_id` = #{companyId} AND customer_id > 0
         AND (project.status &lt;&gt; 3 OR project.status IS NULL)
+        <if test="customerId!=null">
+            and project.customer_id=#{customerId}
+        </if>
+        <if test="projectId!=null">
+            and project.id=#{projectId}
+        </if>
     </select>
 
     <!--分页获取项目收支平衡 -->