Ver código fonte

批量修改项目经理
项目 关键节点 开发

yurk 2 anos atrás
pai
commit
4a9e6429eb
17 arquivos alterados com 436 adições e 25 exclusões
  1. 2 1
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java
  2. 62 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectKeyNodesController.java
  3. 108 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectKeyNodesSettingController.java
  4. 64 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ProjectKeyNodes.java
  5. 11 22
      fhKeeper/formulahousekeeper/user/src/main/java/com/hssx/user/entity/Permission.java
  6. 4 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/TimelinessRateVO.java
  7. 16 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectKeyNodesMapper.java
  8. 16 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectKeyNodesSettingMapper.java
  9. 16 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectKeyNodesService.java
  10. 16 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectKeyNodesSettingService.java
  11. 1 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectService.java
  12. 20 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectKeyNodesServiceImpl.java
  13. 20 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectKeyNodesSettingServiceImpl.java
  14. 40 1
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java
  15. 2 1
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java
  16. 21 0
      fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectKeyNodesMapper.xml
  17. 17 0
      fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectKeyNodesSettingMapper.xml

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

@@ -116,6 +116,7 @@ public class ProjectController {
                                    Double budget,
                                    Integer customerId,
                                    String projectBaseCostData,
+                                   String projectKeyNodesData,
                                    String chosenLeaders,
                                    String associateDegrees,
                                    String associateDegreeNames,
@@ -132,7 +133,7 @@ public class ProjectController {
                                    @RequestParam(defaultValue = "false") boolean onlyChangeParticipate
                                    ) {
         return projectService.editProject(id, name, code, userId, inchargerId, isPublic, planStartDate, planEndDate, level, contractAmount,changeContractReason,
-                projectBaseCostData,
+                projectBaseCostData,projectKeyNodesData,
                  budget,customerId,chosenLeaders, associateDegrees, associateDegreeNames,
                 taskGpIncharge,auditUserIds, category, projectDesc,projectMainId, providerIds, providerNames, request,projectSeparate,outputValue,deptId,onlyChangeParticipate);
     }

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

@@ -0,0 +1,62 @@
+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.util.HttpRespMsg;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-08-29
+ */
+@RestController
+@RequestMapping("/project-key-nodes")
+public class ProjectKeyNodesController {
+    @Resource
+    ProjectKeyNodesMapper projectKeyNodesMapper;
+    @Resource
+    ProjectKeyNodesSettingMapper projectKeyNodesSettingMapper;
+    @Resource
+    UserMapper userMapper;
+    @Resource
+    HttpServletRequest request;
+
+    @RequestMapping("/get")
+    public HttpRespMsg get(Integer projectId) {
+        HttpRespMsg msg = new HttpRespMsg();
+        List<ProjectKeyNodes> list = projectKeyNodesMapper.selectList(new QueryWrapper<ProjectKeyNodes>().eq("project_id", projectId));
+        //检查最新的字段是否有
+        User user = userMapper.selectById(request.getHeader("TOKEN"));
+        List<ProjectKeyNodesSetting> allSettings = projectKeyNodesSettingMapper.selectList(new QueryWrapper<ProjectKeyNodesSetting>().eq("company_id", user.getCompanyId()));
+        List<ProjectKeyNodes> additionalList = new ArrayList<>();
+        allSettings.forEach(all->{
+            if (!list.stream().filter(costItem->costItem.getNodesId().equals(all.getId())).findAny().isPresent()) {
+                ProjectKeyNodes add =new ProjectKeyNodes();
+                add.setNodesName(all.getName());
+                add.setNodesId(all.getId());
+                add.setProjectId(projectId);
+                add.setStates(0);
+                additionalList.add(add);
+            }
+        });
+        if (additionalList.size() > 0) {
+            list.addAll(additionalList);
+        }
+        msg.data = list;
+        return msg;
+    }
+}
+

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

@@ -0,0 +1,108 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.ProjectAddcostItem;
+import com.management.platform.entity.ProjectKeyNodes;
+import com.management.platform.entity.ProjectKeyNodesSetting;
+import com.management.platform.mapper.ProjectKeyNodesMapper;
+import com.management.platform.mapper.ProjectKeyNodesSettingMapper;
+import com.management.platform.mapper.UserMapper;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-08-29
+ */
+@RestController
+@RequestMapping("/project-key-nodes-setting")
+public class ProjectKeyNodesSettingController {
+    @Resource
+    private HttpServletRequest request;
+    @Resource
+    UserMapper userMapper;
+    @Resource
+    ProjectKeyNodesSettingMapper projectKeyNodesSettingMapper;
+
+    @Resource
+    ProjectKeyNodesMapper projectKeyNodesMapper;
+
+    @RequestMapping("/addOrMod")
+    public HttpRespMsg addOrMod(ProjectKeyNodesSetting setting) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if (StringUtils.isEmpty(setting.getName())) {
+            msg.setError("名称不能为空");
+            return msg;
+        }
+        Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
+        if (setting.getId() == null) {
+            setting.setCompanyId(companyId);
+            int count = projectKeyNodesSettingMapper.selectCount(new QueryWrapper<ProjectKeyNodesSetting>().eq("name", setting.getName()).eq("company_id", setting.getCompanyId()));
+            if (count > 0) {
+                msg.setError("该名称已存在");
+            } else {
+                projectKeyNodesSettingMapper.insert(setting);
+                msg.data = projectKeyNodesSettingMapper.selectList(new QueryWrapper<ProjectKeyNodesSetting>().eq("company_id", companyId));
+            }
+        } else {
+            int count = projectKeyNodesSettingMapper.selectCount(new QueryWrapper<ProjectKeyNodesSetting>().eq("name", setting.getName())
+                    .eq("company_id", companyId).ne("id", setting.getId()));
+            if (count > 0) {
+                msg.setError("该名称已存在");
+            } else {
+                //检查名称是否有变化
+                ProjectKeyNodesSetting oldSetting = projectKeyNodesSettingMapper.selectById(setting.getId());
+                if (!setting.getName().equals(oldSetting.getName())) {
+                    projectKeyNodesSettingMapper.updateById(setting);
+                    if (!setting.getName().equals(oldSetting.getName())) {
+                        //名称发生变化了,要更新关联表
+                        ProjectKeyNodes nodes = new ProjectKeyNodes();
+                        nodes.setNodesName(setting.getName());
+                        projectKeyNodesMapper.update(nodes, new QueryWrapper<ProjectKeyNodes>().eq("base_id", setting.getId()));
+                        ProjectAddcostItem addItem = new ProjectAddcostItem();
+                        addItem.setBaseName(setting.getName());
+                    }
+                    msg.data = projectKeyNodesSettingMapper.selectList(new QueryWrapper<ProjectKeyNodesSetting>().eq("company_id", companyId));
+                }
+            }
+        }
+
+        return msg;
+    }
+
+    @RequestMapping("/list")
+    public HttpRespMsg list() {
+        HttpRespMsg msg = new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
+        List<ProjectKeyNodesSetting> list = projectKeyNodesSettingMapper.selectList(new QueryWrapper<ProjectKeyNodesSetting>().eq("company_id", companyId));
+        msg.data = list;
+
+        return msg;
+    }
+
+    @RequestMapping("/delete")
+    public HttpRespMsg delete(Integer id) {
+        HttpRespMsg msg = new HttpRespMsg();
+        ProjectKeyNodesSetting projectKeyNodesSetting = projectKeyNodesSettingMapper.selectById(id);
+        Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
+        if (!projectKeyNodesSetting.getCompanyId().equals(companyId)) {
+            msg.setError("无权操作");
+        } else {
+            projectKeyNodesSettingMapper.deleteById(id);
+        }
+
+        return msg;
+    }
+}
+

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

@@ -0,0 +1,64 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class ProjectKeyNodes extends Model<ProjectKeyNodes> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("project_id")
+    private Integer projectId;
+
+    @TableField("nodes_id")
+    private Integer nodesId;
+
+    @TableField("nodes_name")
+    private String nodesName;
+
+    /**
+     * 计划完成时间
+     */
+    @TableField("plan_complete_date")
+    private LocalDate planCompleteDate;
+
+    /**
+     * 实际完成时间
+     */
+    @TableField("actual_complete_date")
+    private LocalDate actualCompleteDate;
+
+    /**
+     * 0-正常 1-延期 2-完成
+     */
+    @TableField("states")
+    private Integer states;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 11 - 22
fhKeeper/formulahousekeeper/user/src/main/java/com/hssx/user/entity/Permission.java

@@ -1,9 +1,8 @@
-package com.hssx.user.entity;
+package com.management.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,37 +12,27 @@ import java.io.Serializable;
 
 /**
  * <p>
- *
+ * 
  * </p>
  *
- * @author Reiskuchen
- * @since 2019-12-11
+ * @author Seyason
+ * @since 2022-08-29
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("permission")
-public class Permission extends Model<Permission> {
+public class ProjectKeyNodesSetting extends Model<ProjectKeyNodesSetting> {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID=1L;
 
-    /**
-     * 权限表主键
-     */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    /**
-     * 权限名称
-     */
-    @TableField("permission_name")
-    private String permissionName;
-
-    /**
-     * 权限描述
-     */
-    @TableField("describe")
-    private String describe;
+    @TableField("company_id")
+    private Integer companyId;
+
+    @TableField("name")
+    private String name;
 
 
     @Override

+ 4 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/TimelinessRateVO.java

@@ -4,6 +4,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+import java.util.Map;
+
 @Data
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
@@ -11,4 +14,5 @@ public class TimelinessRateVO {
     private String userName;
     private String departmentName;
     private String timelinessRate;
+    private List<Map<String,Object>> dataList;
 }

+ 16 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectKeyNodesMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.ProjectKeyNodes;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-08-29
+ */
+public interface ProjectKeyNodesMapper extends BaseMapper<ProjectKeyNodes> {
+
+}

+ 16 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectKeyNodesSettingMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.ProjectKeyNodesSetting;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-08-29
+ */
+public interface ProjectKeyNodesSettingMapper extends BaseMapper<ProjectKeyNodesSetting> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.ProjectKeyNodes;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-08-29
+ */
+public interface ProjectKeyNodesService extends IService<ProjectKeyNodes> {
+
+}

+ 16 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectKeyNodesSettingService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.ProjectKeyNodesSetting;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-08-29
+ */
+public interface ProjectKeyNodesSettingService extends IService<ProjectKeyNodesSetting> {
+
+}

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

@@ -31,6 +31,7 @@ public interface ProjectService extends IService<Project> {
                             Double contractAmount,
                             String changeContractReason,
                             String projectBaseCostData,
+                            String projectKeyNodesData,
                             Double budget,
                             Integer customerId,
                             String chosenLeaders,

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+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 org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-08-29
+ */
+@Service
+public class ProjectKeyNodesServiceImpl extends ServiceImpl<ProjectKeyNodesMapper, ProjectKeyNodes> implements ProjectKeyNodesService {
+
+}

+ 20 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectKeyNodesSettingServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.ProjectKeyNodesSetting;
+import com.management.platform.mapper.ProjectKeyNodesSettingMapper;
+import com.management.platform.service.ProjectKeyNodesSettingService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2022-08-29
+ */
+@Service
+public class ProjectKeyNodesSettingServiceImpl extends ServiceImpl<ProjectKeyNodesSettingMapper, ProjectKeyNodesSetting> implements ProjectKeyNodesSettingService {
+
+}

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

@@ -106,6 +106,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     @Resource
     StagesMapper stagesMapper;
     @Resource
+    ProjectKeyNodesMapper projectKeyNodesMapper;
+    @Resource
+    ProjectKeyNodesService projectKeyNodesService;
+    @Resource
+    ProjectKeyNodesSettingMapper projectKeyNodesSettingMapper;
+    @Resource
     ProjectBasecostSettingMapper projectBasecostSettingMapper;
     @Resource
     ProjectCurrentcostMapper projectCurrentcostMapper;
@@ -428,6 +434,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                    Double contractAmount,
                                    String changeContractReason,
                                    String projectBaseCostData,
+                                   String projectKeyNodesData,
                                    Double budget,
                                    Integer customerId,
                                    String chosenLeaders,
@@ -716,7 +723,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
                         }
                     }
-
+                    if (projectKeyNodesData != null) {
+                        updateProjectKeyNodesData(projectKeyNodesData, p.getId());
+                    }
                     //更新关联表中的项目名称和编号
                     FinanceProjects fp = new FinanceProjects();
                     fp.setProjectName(p.getProjectName());
@@ -899,6 +908,22 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         return httpRespMsg;
     }
 
+    //更新项目的关键节点数据
+    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));
+        projectKeyNodesService.saveBatch(nodesList);
+        httpRespMsg.data=nodesList;
+        return httpRespMsg;
+    }
+
     private int getNotNullInt(Integer integer) {
         return integer==null?0:integer.intValue();
     }
@@ -4820,9 +4845,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
 
             }
+            List<Map<String,Object>> dataList=new ArrayList<>();
             if(mapList!=null){
                 int num=0;
                 for (Map<String, Object> map : mapList) {
+                    Map<String,Object> objectMap=new HashMap<>();
                     Object date = map.get("createDate");
                     //去掉sql返回的毫秒值
                     Timestamp timestamp = (Timestamp) map.get("createTime");
@@ -4847,8 +4874,11 @@ 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);
                 }
+                timelinessRateVO.setDataList(dataList);
                 BigDecimal bigDecimal=new BigDecimal(num);
                 BigDecimal divide;
                 if(days!=0){
@@ -5786,12 +5816,21 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             list.add(Integer.valueOf(s));
         }
         List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", list));
+        List<Participation> participationList = participationMapper.selectList(new QueryWrapper<Participation>().in("project_id", list));
         for (Project project : projectList) {
             project.setInchargerId(inchargerId);
             if(projectMapper.updateById(project)<=0){
                 httpRespMsg.setError("操作失败");
                 return httpRespMsg;
             }
+            boolean b = participationList.stream().anyMatch(pl -> pl.getProjectId().equals(project.getId()) && pl.getUserId().equals(inchargerId));
+            //项目经理不在参与人当中时 要添加
+            if(!b){
+                Participation participation=new Participation();
+                participation.setProjectId(project.getId());
+                participation.setUserId(inchargerId);
+                participationMapper.insert(participation);
+            }
         }
         return httpRespMsg;
     }

+ 2 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -102,7 +102,7 @@ public class TimingTask {
         IntStream.rangeClosed('0', '9').forEach(VALID_TOKEN_CHARS::add);    // 0-9
         IntStream.rangeClosed('A', 'Z').forEach(VALID_TOKEN_CHARS::add);    // A-Z
         IntStream.rangeClosed('a', 'z').forEach(VALID_TOKEN_CHARS::add);    // a-z
-        IntStream.rangeClosed('!', '*').forEach(VALID_TOKEN_CHARS::add);    // !-*
+        /*IntStream.rangeClosed('!', '*').forEach(VALID_TOKEN_CHARS::add);    // !-**/
     }
 
     //检查项目到期,距离到期时间3天内的,每天提醒
@@ -331,6 +331,7 @@ public class TimingTask {
         List<ThirdPartyInterface> thirdPartyInterfaceList = thirdPartyInterfaceMapper.selectList(null);
         List<String> collect = thirdPartyInterfaceList.stream().map(tf -> tf.getToken()).collect(Collectors.toList());
         for (ThirdPartyInterface thirdPartyInterface : thirdPartyInterfaceList) {
+            if(thirdPartyInterface.getComapnyId()==862) continue;
             List<String> stringList=new ArrayList<>();
             new SecureRandom().ints(passwordLength, 0, VALID_TOKEN_CHARS.size())
                     .map(VALID_TOKEN_CHARS::get).forEach(v->stringList.add(String.valueOf((char) v)));

+ 21 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectKeyNodesMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.ProjectKeyNodesMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ProjectKeyNodes">
+        <id column="id" property="id" />
+        <result column="project_id" property="projectId" />
+        <result column="nodes_id" property="nodesId" />
+        <result column="nodes_name" property="nodesName" />
+        <result column="plan_complete_date" property="planCompleteDate" />
+        <result column="actual_complete_date" property="actualCompleteDate" />
+        <result column="states" property="states" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, project_id, nodes_id, nodes_name, plan_complete_date, actual_complete_date, states
+    </sql>
+
+</mapper>

+ 17 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectKeyNodesSettingMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.ProjectKeyNodesSettingMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.ProjectKeyNodesSetting">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
+        <result column="name" property="name" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, company_id, name
+    </sql>
+
+</mapper>