Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management

pmapi/src/main/java/com/ningdatech/pmapi/ding/task/OrganizationBatchGetTask.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.google.common.collect.Lists;
 import com.ningdatech.basic.model.GenericResult;
 import com.ningdatech.pmapi.ding.model.DingOrgInfoTreeDTO;
-import com.ningdatech.pmapi.organization.entity.DingOrganization;
+import com.ningdatech.pmapi.organization.model.entity.DingOrganization;
 import com.ningdatech.pmapi.organization.service.IDingOrganizationService;
 import com.ningdatech.zwdd.client.ZwddClient;
 import com.ningdatech.zwdd.model.dto.DingOrgInfoDTO;

pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/DingEmployeeInfoMapper.java

@@ -1,6 +1,6 @@
 package com.ningdatech.pmapi.organization.mapper;
 
-import com.ningdatech.pmapi.organization.entity.DingEmployeeInfo;
+import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/DingOrganizationMapper.java

@@ -1,6 +1,6 @@
 package com.ningdatech.pmapi.organization.mapper;
 
-import com.ningdatech.pmapi.organization.entity.DingOrganization;
+import com.ningdatech.pmapi.organization.model.entity.DingOrganization;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/DingEmployeeInfo.java → pmapi/src/main/java/com/ningdatech/pmapi/organization/model/entity/DingEmployeeInfo.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.organization.entity;
+package com.ningdatech.pmapi.organization.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;

pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/DingOrganization.java → pmapi/src/main/java/com/ningdatech/pmapi/organization/model/entity/DingOrganization.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.organization.entity;
+package com.ningdatech.pmapi.organization.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;

pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IDingEmployeeInfoService.java

@@ -1,6 +1,6 @@
 package com.ningdatech.pmapi.organization.service;
 
-import com.ningdatech.pmapi.organization.entity.DingEmployeeInfo;
+import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IDingOrganizationService.java

@@ -1,6 +1,6 @@
 package com.ningdatech.pmapi.organization.service;
 
-import com.ningdatech.pmapi.organization.entity.DingOrganization;
+import com.ningdatech.pmapi.organization.model.entity.DingOrganization;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/DingEmployeeInfoServiceImpl.java

@@ -1,6 +1,6 @@
 package com.ningdatech.pmapi.organization.service.impl;
 
-import com.ningdatech.pmapi.organization.entity.DingEmployeeInfo;
+import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo;
 import com.ningdatech.pmapi.organization.mapper.DingEmployeeInfoMapper;
 import com.ningdatech.pmapi.organization.service.IDingEmployeeInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/DingOrganizationServiceImpl.java

@@ -1,6 +1,6 @@
 package com.ningdatech.pmapi.organization.service.impl;
 
-import com.ningdatech.pmapi.organization.entity.DingOrganization;
+import com.ningdatech.pmapi.organization.model.entity.DingOrganization;
 import com.ningdatech.pmapi.organization.mapper.DingOrganizationMapper;
 import com.ningdatech.pmapi.organization.service.IDingOrganizationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ConstructionPlanController.java

@@ -1,8 +1,8 @@
 package com.ningdatech.pmapi.projectdeclared.controller;
 
 import com.ningdatech.basic.model.PageVo;
-import com.ningdatech.pmapi.projectdeclared.entity.dto.DefaultDeclaredDTO;
-import com.ningdatech.pmapi.projectdeclared.entity.req.ConstrctionPlanListReq;
+import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
+import com.ningdatech.pmapi.projectdeclared.model.req.ConstrctionPlanListReq;
 import com.ningdatech.pmapi.projectdeclared.manage.ConstructionPlanManage;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DeclaredProjectController.java

@@ -1,10 +1,10 @@
 package com.ningdatech.pmapi.projectdeclared.controller;
 
 import com.ningdatech.basic.model.PageVo;
-import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectListParamDTO;
-import com.ningdatech.pmapi.projectdeclared.entity.dto.DefaultDeclaredDTO;
-import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectDraftSaveDTO;
-import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDraftVO;
+import com.ningdatech.pmapi.projectdeclared.model.dto.DeclaredProjectListParamDTO;
+import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
+import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectDraftSaveDTO;
+import com.ningdatech.pmapi.projectdeclared.model.vo.ProjectDraftVO;
 import com.ningdatech.pmapi.projectdeclared.manage.DeclaredProjectManage;
 import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/PrequalificationDeclaredController.java

@@ -1,8 +1,8 @@
 package com.ningdatech.pmapi.projectdeclared.controller;
 
 import com.ningdatech.basic.model.PageVo;
-import com.ningdatech.pmapi.projectdeclared.entity.dto.DefaultDeclaredDTO;
-import com.ningdatech.pmapi.projectdeclared.entity.req.PrequalificationDeclaredListReq;
+import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
+import com.ningdatech.pmapi.projectdeclared.model.req.PrequalificationDeclaredListReq;
 import com.ningdatech.pmapi.projectdeclared.manage.PrequalificationDeclaredProjectManage;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/ProjectAdjustmentController.java

@@ -1,8 +1,8 @@
 package com.ningdatech.pmapi.projectdeclared.controller;
 
 import com.ningdatech.basic.model.PageVo;
-import com.ningdatech.pmapi.projectdeclared.entity.dto.DefaultDeclaredDTO;
-import com.ningdatech.pmapi.projectdeclared.entity.req.AdjustmentListReq;
+import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
+import com.ningdatech.pmapi.projectdeclared.model.req.AdjustmentListReq;
 import com.ningdatech.pmapi.projectdeclared.manage.ProjectAdjustmentManage;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum;
 import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils;
-import com.ningdatech.pmapi.projectdeclared.entity.dto.DefaultDeclaredDTO;
-import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectConditionDTO;
+import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
+import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectConditionDTO;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java

@@ -9,9 +9,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum;
-import com.ningdatech.pmapi.projectdeclared.entity.ProjectDraft;
-import com.ningdatech.pmapi.projectdeclared.entity.dto.*;
-import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDraftVO;
+import com.ningdatech.pmapi.projectdeclared.model.entity.ProjectDraft;
+import com.ningdatech.pmapi.projectdeclared.model.dto.DeclaredProjectListParamDTO;
+import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
+import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectConditionDTO;
+import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectDraftSaveDTO;
+import com.ningdatech.pmapi.projectdeclared.model.vo.ProjectDraftVO;
 import com.ningdatech.pmapi.projectdeclared.service.IProjectDraftService;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java

@@ -1,7 +1,7 @@
 package com.ningdatech.pmapi.projectdeclared.manage;
 
 import com.google.common.collect.Maps;
-import com.ningdatech.pmapi.projectdeclared.entity.dto.DefaultDeclaredDTO;
+import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PrequalificationDeclaredProjectManage.java

@@ -7,8 +7,8 @@ import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum;
 import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils;
 import com.ningdatech.pmapi.projectdeclared.contants.DeclaredProjectContant;
-import com.ningdatech.pmapi.projectdeclared.entity.dto.DefaultDeclaredDTO;
-import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectConditionDTO;
+import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
+import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectConditionDTO;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ProjectAdjustmentManage.java

@@ -3,7 +3,7 @@ package com.ningdatech.pmapi.projectdeclared.manage;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.basic.function.VUtils;
-import com.ningdatech.pmapi.projectdeclared.entity.dto.DefaultDeclaredDTO;
+import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
 import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/ProjectDraftMapper.java

@@ -1,7 +1,7 @@
 package com.ningdatech.pmapi.projectdeclared.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ningdatech.pmapi.projectdeclared.entity.ProjectDraft;
+import com.ningdatech.pmapi.projectdeclared.model.entity.ProjectDraft;
 
 /**
  * <p>

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/DeclaredProjectListParamDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/DeclaredProjectListParamDTO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.projectdeclared.entity.dto;
+package com.ningdatech.pmapi.projectdeclared.model.dto;
 
 import com.ningdatech.basic.model.PagePo;
 import lombok.AllArgsConstructor;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/DefaultDeclaredDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/DefaultDeclaredDTO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.projectdeclared.entity.dto;
+package com.ningdatech.pmapi.projectdeclared.model.dto;
 
 import cn.hutool.core.collection.CollUtil;
 import com.google.common.collect.Maps;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/ProjectConditionDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/ProjectConditionDTO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.projectdeclared.entity.dto;
+package com.ningdatech.pmapi.projectdeclared.model.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/ProjectDraftSaveDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/ProjectDraftSaveDTO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.projectdeclared.entity.dto;
+package com.ningdatech.pmapi.projectdeclared.model.dto;
 
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
 import com.wflow.workflow.bean.dto.ProcessInstanceUserDto;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/ProjectDraft.java → pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.projectdeclared.entity;
+package com.ningdatech.pmapi.projectdeclared.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/req/AdjustmentListReq.java → pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/req/AdjustmentListReq.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.projectdeclared.entity.req;
+package com.ningdatech.pmapi.projectdeclared.model.req;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/req/ConstrctionPlanListReq.java → pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/req/ConstrctionPlanListReq.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.projectdeclared.entity.req;
+package com.ningdatech.pmapi.projectdeclared.model.req;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/req/PrequalificationDeclaredListReq.java → pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/req/PrequalificationDeclaredListReq.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.projectdeclared.entity.req;
+package com.ningdatech.pmapi.projectdeclared.model.req;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/vo/ProjectDeclaredDetailVO.java → pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDeclaredDetailVO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.projectdeclared.entity.vo;
+package com.ningdatech.pmapi.projectdeclared.model.vo;
 
 import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication;
 import io.swagger.annotations.ApiModel;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/vo/ProjectDeclaredListItemVO.java → pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDeclaredListItemVO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.projectdeclared.entity.vo;
+package com.ningdatech.pmapi.projectdeclared.model.vo;
 
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
 import io.swagger.annotations.ApiModel;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/vo/ProjectDraftVO.java → pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.projectdeclared.entity.vo;
+package com.ningdatech.pmapi.projectdeclared.model.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/IProjectDraftService.java

@@ -1,7 +1,7 @@
 package com.ningdatech.pmapi.projectdeclared.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ningdatech.pmapi.projectdeclared.entity.ProjectDraft;
+import com.ningdatech.pmapi.projectdeclared.model.entity.ProjectDraft;
 
 /**
  * <p>

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/impl/ProjectDraftServiceImpl.java

@@ -1,7 +1,7 @@
 package com.ningdatech.pmapi.projectdeclared.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ningdatech.pmapi.projectdeclared.entity.ProjectDraft;
+import com.ningdatech.pmapi.projectdeclared.model.entity.ProjectDraft;
 import com.ningdatech.pmapi.projectdeclared.mapper.ProjectDraftMapper;
 import com.ningdatech.pmapi.projectdeclared.service.IProjectDraftService;
 import org.springframework.stereotype.Service;

pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java

@@ -76,4 +76,7 @@ public class UserInfo implements Serializable {
     @ApiModelProperty("身份证号")
     private String idCard;
 
+    @ApiModelProperty("浙政钉accountId")
+    private Long accountId;
+
 }

pmapi/src/test/java/com/ningdatech/pmapi/sys/project/DraftTest.java

@@ -2,7 +2,7 @@ package com.ningdatech.pmapi.sys.project;
 
 import com.alibaba.fastjson.JSON;
 import com.ningdatech.pmapi.AppTests;
-import com.ningdatech.pmapi.projectdeclared.entity.ProjectDraft;
+import com.ningdatech.pmapi.projectdeclared.model.entity.ProjectDraft;
 import com.ningdatech.pmapi.projectdeclared.service.IProjectDraftService;
 import org.junit.Test;