Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -4,6 +4,7 @@ package com.management.platform.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.*;
 import com.management.platform.mapper.*;
+import com.management.platform.service.ProjectKeyNodesService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -33,6 +34,8 @@ public class ProjectKeyNodesController {
     UserMapper userMapper;
     @Resource
     HttpServletRequest request;
+    @Resource
+    ProjectKeyNodesService projectKeyNodesService;
 
     @RequestMapping("/get")
     public HttpRespMsg get(Integer projectId) {
@@ -47,8 +50,10 @@ public class ProjectKeyNodesController {
                 ProjectKeyNodes add =new ProjectKeyNodes();
                 add.setNodesName(all.getName());
                 add.setNodesId(all.getId());
+                add.setActualCompleteDate(null);
+                add.setPlanCompleteDate(null);
                 add.setProjectId(projectId);
-                add.setStates(0);
+                add.setStates("0");
                 additionalList.add(add);
             }
         });
@@ -58,5 +63,9 @@ public class ProjectKeyNodesController {
         msg.data = list;
         return msg;
     }
+    @RequestMapping("/edit")
+    public HttpRespMsg edit(String data,Integer projectId){
+       return projectKeyNodesService.edit(data,projectId);
+    }
 }
 

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

@@ -69,7 +69,7 @@ public class ProjectKeyNodesSettingController {
                         //名称发生变化了，要更新关联表
                         ProjectKeyNodes nodes = new ProjectKeyNodes();
                         nodes.setNodesName(setting.getName());
-                        projectKeyNodesMapper.update(nodes, new QueryWrapper<ProjectKeyNodes>().eq("base_id", setting.getId()));
+                        projectKeyNodesMapper.update(nodes, new QueryWrapper<ProjectKeyNodes>().eq("nodes_id", setting.getId()));
                         ProjectAddcostItem addItem = new ProjectAddcostItem();
                         addItem.setBaseName(setting.getName());
                     }

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

@@ -1,14 +1,16 @@
 package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 /**
  * <p>
@@ -40,20 +42,24 @@ public class ProjectKeyNodes extends Model<ProjectKeyNodes> {
     /**
      * 计划完成时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField("plan_complete_date")
-    private LocalDate planCompleteDate;
+    private String planCompleteDate;
 
     /**
      * 实际完成时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField("actual_complete_date")
-    private LocalDate actualCompleteDate;
+    private String actualCompleteDate;
 
     /**
      * 0-正常 1-延期 2-完成
      */
     @TableField("states")
-    private Integer states;
+    private String states;
 
 
     @Override

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

@@ -2,6 +2,7 @@ package com.management.platform.service;
 
 import com.management.platform.entity.ProjectKeyNodes;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.management.platform.util.HttpRespMsg;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ProjectKeyNodesService extends IService<ProjectKeyNodes> {
 
+    HttpRespMsg edit(String data,Integer projectId);
 }

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

@@ -1,11 +1,19 @@
 package com.management.platform.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.ProjectKeyNodes;
 import com.management.platform.mapper.ProjectKeyNodesMapper;
 import com.management.platform.service.ProjectKeyNodesService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.management.platform.util.HttpRespMsg;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +25,27 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProjectKeyNodesServiceImpl extends ServiceImpl<ProjectKeyNodesMapper, ProjectKeyNodes> implements ProjectKeyNodesService {
 
+    @Resource
+    ProjectKeyNodesMapper projectKeyNodesMapper;
+
+    @Override
+    public HttpRespMsg edit(String data,Integer proejctId) {
+       return updateProjectKeyNodesData(data,proejctId);
+    }
+
+    //更新项目的关键节点数据
+    private HttpRespMsg updateProjectKeyNodesData(String data, Integer projectId) {
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        JSONArray array = JSONArray.parseArray(data);
+        List<ProjectKeyNodes> nodesList = new ArrayList<>();
+        for (int i=0;i<array.size(); i++) {
+            ProjectKeyNodes projectKeyNodes = JSONObject.toJavaObject(array.getJSONObject(i), ProjectKeyNodes.class);
+            projectKeyNodes.setProjectId(projectId);
+            nodesList.add(projectKeyNodes);
+        }
+        projectKeyNodesMapper.delete(new QueryWrapper<ProjectKeyNodes>().eq("project_id", projectId));
+        saveBatch(nodesList);
+        httpRespMsg.data=nodesList;
+        return httpRespMsg;
+    }
 }

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

@@ -559,6 +559,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 earningSnapshotMapper.insert(snapshot);
                             }
                         }
+                        if (projectKeyNodesData != null) {
+                            updateProjectKeyNodesData(projectKeyNodesData, project.getId());
+                        }
                     }
                     id = project.getId();
                     if(companyId==936){
@@ -607,7 +610,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 convertDepartmentIdToCascade(deptId))
                         .setProviderNames(providerNames);
                 //编辑项目合同修改 添加记录
-                if(project.getContractAmount().doubleValue()!=contractAmount){
+                if(contractAmount!=null&&project.getContractAmount().doubleValue()!=contractAmount){
                     ContractModifyRecord contractModifyRecord=new ContractModifyRecord();
                     contractModifyRecord.setEditUserId(user.getId());
                     contractModifyRecord.setOldContractAmount(project.getContractAmount());
@@ -4875,8 +4878,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     if(createTimeDate.isBefore(createDate)||createTimeDate.isEqual(createDate)){
                         num++;
                         objectMap.put(createTimeDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),"及时");
+                        dataList.add(objectMap);
                     }
-                    dataList.add(objectMap);
                 }
                 timelinessRateVO.setDataList(dataList);
                 BigDecimal bigDecimal=new BigDecimal(num);