Merge remote-tracking branch 'origin/master'

ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java

@@ -56,7 +56,7 @@ public class GeneratorCodeKingbaseConfig {
     }
 
     public static void main(String[] args) {
-        generate("Lierbao", "organization", PATH_LXX, "ding_employee_info");
+        generate("Poffy", "projectlib", PATH_YYD, "nd_project_inst");
     }
 
 }

pmapi/src/main/java/com/ningdatech/pmapi/common/config/BeanConfig.java

@@ -3,7 +3,6 @@ package com.ningdatech.pmapi.common.config;
 import com.alibaba.xxpt.gateway.shared.client.http.ExecutableClient;
 import com.ningdatech.pmapi.common.util.SpringContextHolder;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;

pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java

@@ -0,0 +1,147 @@
+package com.ningdatech.pmapi.common.enumeration;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * 导出选项枚举
+ *
+ * @author CMM
+ * @since 2023/02/10 16:38
+ */
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public enum ExportOptionEnum {
+    /**
+     * 导出选项
+     */
+    id(1, "项目ID"),
+
+    projectName(2, "项目名称"),
+
+    areaCode(3, "行政区划编码"),
+
+    area(4, "行政区划名称"),
+
+    responsibleMan(5, "项目负责人"),
+
+    responsibleManMobile(6, "项目负责人手机号"),
+
+    contactName(7, "项目联系人"),
+
+    contactPhone(8, "项目联系人手机号"),
+
+    higherSuperOrg(9, "上级业务主管单位"),
+
+    higherSuperOrgCode(10, "上级主管单位浙政钉ID"),
+
+    superOrg(11, "本级主管部门"),
+
+    superOrgCode(12, "本级主管部门浙政钉ID"),
+
+    buildOrgName(13, "建设单位名称"),
+
+    buildOrgZheJiangGovDingId(14, "建设单位浙政钉ID"),
+
+    buildOrgCode(15, "建设单位统一信用代码"),
+
+    projectType(16, "项目类型"),
+
+    isFirst(17, "是否首次新建"),
+
+    relatedExistsApplication(18, "关联应用"),
+
+    relatedExistsApplicationCode(19, "关联应用IRS编码"),
+
+    declareAmount(20, "申报金额(万元)"),
+
+    approvedTotalInvestmentIncrease(21, "批复金额"),
+
+    /**
+     * 表里没有
+     */
+    budgetSource(22, "预算来源"),
+
+    projectYear(23, "预算年度"),
+
+    projectIntroduction(24, "项目简介"),
+
+    buildBasis(25, "立项依据"),
+
+    buildLevel(26, "建设层级"),
+
+    developCode(27, "发改编码"),
+
+    financialCode(28, "财政编码"),
+
+    /**
+     * 表里没有
+     */
+    informationValidity(29, "信息是否有效"),
+
+
+    isDigitalReform(30, "是否数字化改革项目"),
+
+    bizDomain(31, "综合应用领域"),
+
+    isCloud(32, "是否上云"),
+
+    cloudType(33, "云类型"),
+
+    fourSystems(34, "四大体系"),
+    isTemporaryAugment(35, "是否临时增补"),
+
+    protectionLevel(36, "等保级别"),
+
+    isSecretComments(37, "是否密评"),
+
+    businessNumber(38, "业务编号"),
+
+    businessName(39, "业务名称"),
+
+    orgName(40, "单位名称"),
+
+    softwareDevelopmentAmount(41, "软件开发(万元)"),
+
+    cloudHardwarePurchaseAmount(42, "云资源、硬件购置(万元)"),
+
+    thirdPartyAmount(43, "第三方服务(万元)"),
+
+    safetyInputTitle(44, "投入项"),
+
+    safetyInputDescribe(45, "内容描述"),
+
+    safetyInputAmount(46, "金额"),
+
+    annualPlanAmount(47, "年度支付金额(万元)"),
+
+    annualPlanHaveAmount(48, "自有资金(万元)"),
+
+    declareGovOwnFinanceAmount(49, "政府投资-本级财政资金(万元)"),
+
+    declareGovSuperiorFinanceAmount(50, "政府投资-上级补助资金(万元)"),
+
+    declareBankLendingAmount(51, "银行贷款(万元)"),
+
+    declareOtherAmount(52, "其它资金(万元)"),
+
+    engineeringSpeedOne(53, "第一季度"),
+
+    engineeringSpeedTwo(54, "第二季度"),
+
+    engineeringSpeedThree(55, "第三季度"),
+
+    engineeringSpeedFour(56, "第四季度"),
+
+    preliminaryPlanFile(57, "初步方案"),
+
+    supportingMaterialsFile(58, "附件-佐证材料"),
+
+    projectRemarks(59, "备注");
+
+    private Integer code;
+    private String desc;
+}

pmapi/src/main/java/com/ningdatech/pmapi/common/enums/ProjectProessStageEnum.java → pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ProjectProessStageEnum.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.common.enums;
+package com.ningdatech.pmapi.common.enumeration;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

pmapi/src/main/java/com/ningdatech/pmapi/common/enums/ExportOptionEnum.java

@@ -1,148 +0,0 @@
-package com.ningdatech.pmapi.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-
-
-/**
- * 导出选项枚举
- *
- * @author CMM
- * @since 2023/02/10 16:38
- */
-@Getter
-@AllArgsConstructor
-@NoArgsConstructor
-public enum ExportOptionEnum {
-    /**
-     * 导出选项
-     */
-    id(1,"项目ID"),
-
-    projectName(2,"项目名称"),
-
-    areaCode(3,"行政区划编码"),
-
-    area(4,"行政区划名称"),
-
-    responsibleMan(5,"项目负责人"),
-
-    responsibleManMobile(6,"项目负责人手机号"),
-
-    contactName(7,"项目联系人"),
-
-    contactPhone(8,"项目联系人手机号"),
-
-    higherSuperOrg(9,"上级业务主管单位"),
-
-    higherSuperOrgCode(10,"上级主管单位浙政钉ID"),
-
-    superOrg(11,"本级主管部门"),
-
-    superOrgCode(12,"本级主管部门浙政钉ID"),
-
-    buildOrgName(13,"建设单位名称"),
-
-    buildOrgZheJiangGovDingId(14,"建设单位浙政钉ID"),
-
-    buildOrgCode(15,"建设单位统一信用代码"),
-
-    projectType(16,"项目类型"),
-
-    isFirst(17,"是否首次新建"),
-
-    relatedExistsApplication(18,"关联应用"),
-
-    relatedExistsApplicationCode(19,"关联应用IRS编码"),
-
-    declareAmount(20,"申报金额(万元)"),
-
-    approvedTotalInvestmentIncrease(21,"批复金额"),
-
-    /**
-     * 表里没有
-     */
-    budgetSource(22,"预算来源"),
-
-    projectYear(23,"预算年度"),
-
-    projectIntroduction(24,"项目简介"),
-
-    buildBasis(25,"立项依据"),
-
-    buildLevel(26,"建设层级"),
-
-    developCode(27,"发改编码"),
-
-    financialCode(28,"财政编码"),
-
-    /**
-     * 表里没有
-     */
-    informationValidity(29,"信息是否有效"),
-
-
-    isDigitalReform(30,"是否数字化改革项目"),
-
-    bizDomain(31,"综合应用领域"),
-
-    isCloud(32,"是否上云"),
-
-    cloudType(33,"云类型"),
-
-    fourSystems(34,"四大体系"),
-    isTemporaryAugment(35,"是否临时增补"),
-
-    protectionLevel(36,"等保级别"),
-
-    isSecretComments(37,"是否密评"),
-
-    businessNumber(38,"业务编号"),
-
-    businessName(39,"业务名称"),
-
-    orgName(40,"单位名称"),
-
-    softwareDevelopmentAmount(41,"软件开发(万元)"),
-
-    cloudHardwarePurchaseAmount(42,"云资源、硬件购置(万元)"),
-
-    thirdPartyAmount(43,"第三方服务(万元)"),
-
-    safetyInputTitle(44,"投入项"),
-
-    safetyInputDescribe(45,"内容描述"),
-
-    safetyInputAmount(46,"金额"),
-
-    annualPlanAmount(47,"年度支付金额(万元)"),
-
-    annualPlanHaveAmount(48,"自有资金(万元)"),
-
-    declareGovOwnFinanceAmount(49,"政府投资-本级财政资金(万元)"),
-
-    declareGovSuperiorFinanceAmount(50,"政府投资-上级补助资金(万元)"),
-
-    declareBankLendingAmount(51,"银行贷款(万元)"),
-
-    declareOtherAmount(52,"其它资金(万元)"),
-
-    engineeringSpeedOne(53,"第一季度"),
-
-    engineeringSpeedTwo(54,"第二季度"),
-
-    engineeringSpeedThree(55,"第三季度"),
-
-    engineeringSpeedFour(56,"第四季度"),
-
-    preliminaryPlanFile(57,"初步方案"),
-
-    supportingMaterialsFile(58,"附件-佐证材料"),
-
-    projectRemarks(59,"备注");
-
-    private Integer code;
-    private String desc;
-}

pmapi/src/main/java/com/ningdatech/pmapi/common/handler/GlobalResponseHandler.java

@@ -2,7 +2,7 @@ package com.ningdatech.pmapi.common.handler;
 
 import cn.hutool.json.JSONUtil;
 import com.ningdatech.basic.model.ApiResponse;
-import com.ningdatech.pmapi.common.utils.BizUtils;
+import com.ningdatech.pmapi.common.util.BizUtils;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineBuilder.java

@@ -91,7 +91,7 @@ public class ProjectDeclareStateMachineBuilder {
                 .withChoice()
                 .source(ProjectStatusEnum.PENDING_PREQUALIFICATION_CHOICE)
                 .first(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS,projectDeclareGuardFactory.new PendingPreQualificationChoiceGuard(),projectDeclareAction.new ProjectDeclareChoiceAction())
-                .last(ProjectStatusEnum.PRE_APPLYING).and()
+                .last(ProjectStatusEnum.PRE_APPLYING,projectDeclareAction.new ProjectDeclareChoiceAction()).and()
                 // 待预审撤回，从待预审到单位内部审核中
                 .withExternal()
                 .source(ProjectStatusEnum.PENDING_PREQUALIFICATION)
@@ -127,11 +127,11 @@ public class ProjectDeclareStateMachineBuilder {
                 .source(ProjectStatusEnum.PRE_APPLYING)
                 .target(ProjectStatusEnum.PENDING_PREQUALIFICATION_CHOICE)
                 .event(ProjectStatusChangeEvent.PRE_APPLYING_WITHDRAW).and()
-                // 预审中撤回，从待预审选择->省级部门联审中，预审中，完成其中一种状态
+                // 预审中撤回，从待预审选择->省级部门联审中，待预审，完成其中一种状态
                 .withChoice()
                 .source(ProjectStatusEnum.PRE_APPLYING)
                 .first(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS,projectDeclareGuardFactory.new PendingPreQualificationChoiceGuard(),new ProjectDeclareChoiceAction())
-                .last(ProjectStatusEnum.PRE_APPLYING).and()
+                .last(ProjectStatusEnum.PENDING_PREQUALIFICATION,projectDeclareAction.new ProjectDeclareChoiceAction()).and()
                 // 部门联审通过，从部门联审中到年度计划中
                 .withExternal()
                 .source(ProjectStatusEnum.DEPARTMENT_JOINT_REVIEW)

pmapi/src/main/java/com/ningdatech/pmapi/common/utils/BizUtils.java → pmapi/src/main/java/com/ningdatech/pmapi/common/util/BizUtils.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.common.utils;
+package com.ningdatech.pmapi.common.util;
 
 import cn.hutool.core.util.StrUtil;
 import com.ningdatech.basic.util.StrPool;

pmapi/src/main/java/com/ningdatech/pmapi/common/utils/TreeUtil.java → pmapi/src/main/java/com/ningdatech/pmapi/common/util/TreeUtil.java

@@ -1,12 +1,12 @@
-package com.ningdatech.pmapi.common.utils;
+package com.ningdatech.pmapi.common.util;
 
 
 import cn.hutool.core.collection.CollUtil;
 import com.google.common.collect.Maps;
 import com.ningdatech.basic.util.StrPool;
 import com.ningdatech.pmapi.common.model.entity.MenuTreeEntity;
-import com.ningdatech.pmapi.sys.entity.RoleMenu;
-import com.ningdatech.pmapi.sys.entity.vo.MenuRoleVO;
+import com.ningdatech.pmapi.sys.model.entity.RoleMenu;
+import com.ningdatech.pmapi.sys.model.vo.MenuRoleVO;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;

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

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ningdatech.basic.model.PageVo;
-import com.ningdatech.pmapi.common.enums.ProjectProessStageEnum;
+import com.ningdatech.pmapi.common.enumeration.ProjectProessStageEnum;
 import com.ningdatech.pmapi.projectdeclared.entity.ProjectDraft;
 import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectDto;
 import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectListParamDto;

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

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.basic.function.VUtils;
-import com.ningdatech.pmapi.common.enums.ProjectProessStageEnum;
+import com.ningdatech.pmapi.common.enumeration.ProjectProessStageEnum;
 import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils;
 import com.ningdatech.pmapi.projectdeclared.entity.dto.PreDeclaredProjectDto;
 import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectConditionDto;
@@ -108,7 +108,7 @@ public class PrequalificationDeclaredProjectManage {
             project.setUpdateOn(LocalDateTime.now());
             project.setInstCode(instanceId);
             //调用状态机 进入下一个通过状态
-            stateMachineUtils.execute(project,stateMachineUtils.getProjectStatusPassEvent(project.getStatus()));
+            stateMachineUtils.execute(project, stateMachineUtils.getProjectStatusPassEvent(project.getStatus()));
             projectService.updateById(project);
         } catch (Exception e) {
             log.error("提交预审 项目信息修改 错误 ", e);

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java

@@ -1,15 +1,20 @@
 package com.ningdatech.pmapi.projectlib.controller;
 
 import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.log.annotation.WebLog;
 import com.ningdatech.pmapi.projectlib.manage.AnnualPlanLibManage;
+import com.ningdatech.pmapi.projectlib.model.req.ProjectApprovedReq;
+import com.ningdatech.pmapi.projectlib.model.req.ProjectIdReq;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
+import com.ningdatech.pmapi.projectlib.model.req.StartProjectDeclareReq;
 import com.ningdatech.pmapi.projectlib.model.vo.AnnualPlanListItemVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
 
 /**
  * <p>
@@ -33,4 +38,32 @@ public class AnnualPlanController {
         return annualPlanLibManage.annulPlanLibList(req);
     }
 
+    @PostMapping("/startProjectDeclared")
+    @ApiOperation("开启项目申报")
+    @WebLog("开启项目申报")
+    public void startProjectDeclared(@RequestBody @Valid StartProjectDeclareReq req) {
+        annualPlanLibManage.startProjectDeclared(req);
+    }
+
+    @PostMapping("/projectApproved")
+    @ApiOperation("立项批复")
+    @WebLog("立项批复")
+    public void projectApproved(@RequestBody @Valid ProjectApprovedReq req) throws Exception {
+        annualPlanLibManage.projectApproved(req);
+    }
+
+    @PostMapping("/suspendAnnualPlan")
+    @ApiOperation("暂缓年度计划")
+    @WebLog("暂缓年度计划")
+    public void suspendAnnualPlan(@RequestBody @Valid ProjectIdReq req) throws Exception {
+        annualPlanLibManage.suspendAnnualPlan(req);
+    }
+
+    @PostMapping("/importAnnualPlan")
+    @ApiOperation("导入年度计划")
+    @WebLog("导入年度计划")
+    public void importAnnualPlan(MultipartFile file) {
+        annualPlanLibManage.importAnnualPlan(file);
+    }
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java

@@ -40,10 +40,4 @@ public class ProjectLibController {
         return projectLibManage.getProjectDetail(id);
     }
 
-    @GetMapping("/getProjectInfo")
-    @ApiOperation("获取申报项目信息")
-    private Project getProjectInfo (@RequestParam String processInstanceId){
-        return projectLibManage.getProjectInfo(processInstanceId);
-    }
-
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/enumeration/ProjectStatusEnum.java

@@ -56,10 +56,6 @@ public enum ProjectStatusEnum {
      */
     ARCHIVED(30000, "已归档");
 
-    public static void main(String[] args) {
-        System.out.println(Arrays.stream(ProjectStatusEnum.values()).filter(w -> w.getCode() >= 10010).collect(Collectors.toList()));
-    }
-
     private Integer code;
     private String desc;
 
@@ -87,4 +83,8 @@ public enum ProjectStatusEnum {
         return null;
     }
 
+    public boolean eq(int code) {
+        return this.getCode().equals(code);
+    }
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java

@@ -1,21 +1,37 @@
 package com.ningdatech.pmapi.projectlib.manage;
 
+import cn.hutool.poi.excel.ExcelUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelReader;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.pmapi.common.statemachine.event.ProjectStatusChangeEvent;
+import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
+import com.ningdatech.pmapi.projectlib.model.req.ProjectApprovedReq;
+import com.ningdatech.pmapi.projectlib.model.req.ProjectIdReq;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
+import com.ningdatech.pmapi.projectlib.model.req.StartProjectDeclareReq;
 import com.ningdatech.pmapi.projectlib.model.vo.AnnualPlanListItemVO;
 import com.ningdatech.pmapi.projectlib.service.IProjectService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import static com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum.*;
 
@@ -32,13 +48,13 @@ import static com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum.*;
 public class AnnualPlanLibManage {
 
     private final IProjectService projectService;
+    private final StateMachineUtils stateMachine;
 
     /**
      * 年度计划查询状态
      */
     private static final List<ProjectStatusEnum> ANNUAL_PLAN_LIST_STATUS = Arrays.asList(
             IN_THE_ANNUAL_PLAN,
-            BE_SUSPENDED,
             SCHEME_UNDER_REVIEW,
             SCHEME_REVIEW_FAILED,
             TO_BE_APPROVED,
@@ -57,6 +73,7 @@ public class AnnualPlanLibManage {
 
     public PageVo<AnnualPlanListItemVO> annulPlanLibList(ProjectListReq req) {
         LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req);
+        query.eq(Project::getIsTemporaryAugment, 0);
         query.orderByDesc(Project::getAnnualPlanAddTime);
         query.in(Project::getStatus, CollUtils.fieldList(ANNUAL_PLAN_LIST_STATUS, ProjectStatusEnum::getCode));
         Page<Project> page = projectService.page(req.page(), query);
@@ -76,11 +93,56 @@ public class AnnualPlanLibManage {
             item.setDeclaredAmount(w.getDeclareAmount());
             item.setBuildOrg(w.getBuildOrgName());
             item.setCreateOn(w.getCreateOn());
-            // TODO 是否开启项目申报
-            item.setIsStartDeclaredProject(true);
+            item.setIsStartDeclaredProject(!IN_THE_ANNUAL_PLAN.eq(w.getStatus()));
             result.getRecords().add(item);
         });
         return result;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void startProjectDeclared(StartProjectDeclareReq req) {
+        List<Project> projects = projectService.listByIds(req.getProjectIds());
+        projects.forEach(w -> {
+            if (!IN_THE_ANNUAL_PLAN.eq(w.getStatus())) {
+                throw BizException.wrap("开启方案申报失败");
+            }
+        });
+        projects.forEach(project -> {
+            try {
+                stateMachine.execute(project, ProjectStatusChangeEvent.ANNUAL_PLAN_PROJECT_OPEN_PLAN_DECLARE);
+            } catch (Exception e) {
+                throw new BizException("开启方案申报失败");
+            }
+        });
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void projectApproved(ProjectApprovedReq req) throws Exception {
+        Project project = projectService.getById(req.getProjectId());
+        stateMachine.execute(project, ProjectStatusChangeEvent.PROJECT_APPROVAL);
+        LambdaUpdateWrapper<Project> update = Wrappers.lambdaUpdate(Project.class)
+                .set(Project::getApprovalAmount, req.getApprovedAmount())
+                .set(Project::getApprovedFile, req.getApprovedFileId())
+                .set(Project::getBuildCycle, req.getBuildCycle())
+                .set(Project::getConstructionPlanFile, req.getBuildPlanFileId())
+                .set(Project::getApprovalDate, req.getApprovedDate())
+                .eq(Project::getId, req.getProjectId());
+        projectService.update(update);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void suspendAnnualPlan(ProjectIdReq req) throws Exception {
+        Project project = projectService.getById(req.getProjectId());
+        stateMachine.execute(project, ProjectStatusChangeEvent.ANNUAL_PLAN_SUSPEND);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void importAnnualPlan(MultipartFile file) {
+        try (InputStream inputStream = file.getInputStream()) {
+            EasyExcel.read(inputStream).sheet(0);
+        } catch (IOException e) {
+            throw BizException.wrap("导入年度计划失败");
+        }
+    }
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java

@@ -95,17 +95,4 @@ public class ProjectLibManage {
         return vo;
     }
 
-    /**
-     *
-     * @param instanceCode 申报项目流程实例编号
-     * @return com.ningdatech.pmapi.projectlib.model.entity.Project
-     * @author CMM
-     * @since 2023/02/11 11:15
-     */
-    public Project getProjectInfo(String instanceCode) {
-        // 查询项目申报信息
-        Project projectInfo = projectService.getOne(Wrappers.lambdaQuery(Project.class)
-                .eq(Project::getInstCode, instanceCode));
-        return projectInfo;
-    }
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectInstMapper.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.projectlib.mapper;
+
+import com.ningdatech.pmapi.projectlib.model.entity.ProjectInst;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Poffy
+ * @since 2023-02-13
+ */
+public interface ProjectInstMapper extends BaseMapper<ProjectInst> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectInstMapper.xml

@@ -0,0 +1,5 @@
+<?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.ningdatech.pmapi.projectlib.mapper.ProjectInstMapper">
+
+</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/AnnualLibImportDTO.java

@@ -0,0 +1,108 @@
+package com.ningdatech.pmapi.projectlib.model.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * AnnualLibImportDTO
+ * </p>
+ *
+ * @author WendyYang
+ * @since 13:46 2023/2/13
+ */
+@Data
+public class AnnualLibImportDTO {
+
+    @ExcelProperty("序号")
+    @NotNull(message = "序号不能为空")
+    private Integer serialNumber;
+
+    @ExcelProperty("项目id")
+    @NotNull(message = "项目ID不能为空")
+    private Long projectId;
+
+    @ExcelProperty("项目名称")
+    @NotBlank(message = "项目名称不能为空")
+    private String projectName;
+
+    @NotBlank(message = "建设内容不能为空")
+    @ExcelProperty("建设内容")
+    private String projectIntroduction;
+
+    @NotBlank(message = "建设依据不能为空")
+    @ExcelProperty("建设依据")
+    private String buildBasis;
+
+    @ExcelProperty("建设性质")
+    @NotBlank(message = "建设性质不能为空")
+    private String isFirst;
+
+    @ExcelProperty("建设起止年限")
+    @NotBlank(message = "建设起止年限不能为空")
+    private String buildCycle;
+
+    @NotBlank(message = "总投资不能为空")
+    @ExcelProperty("总投资")
+    private BigDecimal declaredAmount;
+
+    @NotNull(message = "年度投资额不能为空")
+    @ExcelProperty("年度投资额")
+    private BigDecimal annualPlanAMount;
+
+    @ExcelProperty("自有资金")
+    @NotNull(message = "自由资金不能为空")
+    private BigDecimal declareHaveAmount;
+
+    @ExcelProperty("政府投资-本级财政")
+    @NotNull(message = "政府投资-本级财政不能为空")
+    private BigDecimal declareGovOwnFinanceAmount;
+
+    @ExcelProperty("政府投资-上级补")
+    @NotNull(message = "政府投资-上级补不能为空")
+    private BigDecimal declareGovSuperiorFinanceAmount;
+
+    @ExcelProperty("银行贷款")
+    @NotNull(message = "银行贷款不能为空")
+    private BigDecimal declareBankLendingAmount;
+
+    @ExcelProperty("其他")
+    @NotNull(message = "其他不能为空")
+    private BigDecimal declareOtherAmount;
+
+    @ExcelProperty("一季度")
+    @NotBlank(message = "一季度不能为空")
+    private String engineeringSpeedOne;
+
+    @ExcelProperty("二季度")
+    @NotBlank(message = "二季度不能为空")
+    private String engineeringSpeedTwo;
+
+    @ExcelProperty("三季度")
+    @NotBlank(message = "三季度不能为空")
+    private String engineeringSpeedThree;
+
+    @ExcelProperty("四季度")
+    @NotBlank(message = "四季度不能为空")
+    private String engineeringSpeedFour;
+
+    @ExcelProperty("建设单位")
+    @NotBlank(message = "建设单位不能为空")
+    private String buildUnitName;
+
+    @ExcelProperty("项目联系人")
+    @NotBlank(message = "项目联系人不能为空")
+    private String contactName;
+
+    @ExcelProperty("项目分管领导")
+    @NotBlank(message = "项目分管领导不能为空")
+    private String responsibleMan;
+
+    @ExcelProperty("备注")
+    private String projectRemarks;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -257,6 +258,9 @@ public class Project implements Serializable {
     @ApiModelProperty("立项批复文件")
     private String approvedFile;
 
+    @ApiModelProperty("立项批复时间")
+    private LocalDate approvalDate;
+
     @ApiModelProperty("批复金额")
     private BigDecimal approvedTotalInvestmentIncrease;
 

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/ProjectInst.java

@@ -0,0 +1,78 @@
+package com.ningdatech.pmapi.projectlib.model.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Poffy
+ * @since 2023-02-13
+ */
+@TableName("nd_project_inst")
+@ApiModel(value = "NdProjectInst对象", description = "")
+public class ProjectInst implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private Long projectId;
+
+    private String instCode;
+
+    private LocalDateTime creatOn;
+
+    private LocalDateTime updateOn;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+    public String getInstCode() {
+        return instCode;
+    }
+
+    public void setInstCode(String instCode) {
+        this.instCode = instCode;
+    }
+    public LocalDateTime getCreatOn() {
+        return creatOn;
+    }
+
+    public void setCreatOn(LocalDateTime creatOn) {
+        this.creatOn = creatOn;
+    }
+    public LocalDateTime getUpdateOn() {
+        return updateOn;
+    }
+
+    public void setUpdateOn(LocalDateTime updateOn) {
+        this.updateOn = updateOn;
+    }
+
+    @Override
+    public String toString() {
+        return "NdProjectInst{" +
+            "id=" + id +
+            ", projectId=" + projectId +
+            ", instCode=" + instCode +
+            ", creatOn=" + creatOn +
+            ", updateOn=" + updateOn +
+        "}";
+    }
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectApprovedReq.java

@@ -0,0 +1,53 @@
+package com.ningdatech.pmapi.projectlib.model.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 立项批复参数类
+ * </p>
+ *
+ * @author WendyYang
+ * @since 20:04 2023/2/12
+ */
+@Data
+@ApiModel("立项批复参数类")
+public class ProjectApprovedReq {
+
+    @ApiModelProperty("项目ID")
+    @NotNull(message = "项目ID不能为空")
+    private Long projectId;
+
+    @ApiModelProperty("批复金额")
+    @NotNull(message = "批复金额不能为空")
+    @DecimalMax(value = "999999999.99", message = "批复金额无效")
+    @DecimalMin(value = "0.01", message = "批复金额无效")
+    private BigDecimal approvedAmount;
+
+    @NotNull(message = "批复时间不能为空")
+    @ApiModelProperty("批复时间")
+    private LocalDate approvedDate;
+
+    @ApiModelProperty("建设周期")
+    @NotNull(message = "建设周期不能为空")
+    @Range(min = 1, max = 99999, message = "建设周期无效")
+    private Integer buildCycle;
+
+    @ApiModelProperty("批复文件ID")
+    @NotNull(message = "批复文件不能为空")
+    private Long approvedFileId;
+
+    @ApiModelProperty("建设方案文件ID")
+    @NotNull(message = "建设方案不能为空")
+    private Long buildPlanFileId;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectIdReq.java

@@ -0,0 +1,23 @@
+package com.ningdatech.pmapi.projectlib.model.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * ProjectIdReq
+ * </p>
+ *
+ * @author WendyYang
+ * @since 09:32 2023/2/13
+ */
+@Data
+public class ProjectIdReq {
+
+    @ApiModelProperty("项目ID")
+    @NotNull(message = "项目ID不能为空")
+    private Long projectId;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/StartProjectDeclareReq.java

@@ -0,0 +1,25 @@
+package com.ningdatech.pmapi.projectlib.model.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * <p>
+ * StartProjectDeclareReq
+ * </p>
+ *
+ * @author WendyYang
+ * @since 17:47 2023/2/11
+ */
+@Data
+public class StartProjectDeclareReq {
+
+    @ApiModelProperty("项目ID")
+    @NotEmpty(message = "项目ID不能为空")
+    private List<Long> projectIds;
+
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java

@@ -1,9 +1,8 @@
 package com.ningdatech.pmapi.projectlib.model.vo;
 
 import com.alibaba.fastjson.JSON;
-import com.ningdatech.pmapi.common.utils.BizUtils;
+import com.ningdatech.pmapi.common.util.BizUtils;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
-import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,7 +14,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * <p>
@@ -274,21 +272,21 @@ public class ProjectDetailVO {
     private List<ProjectApplicationVO> projectApplications;
 
     @ApiModelProperty("动态form")
-    private Map<String,Object> dynamicForm;
+    private Map<String, Object> dynamicForm;
 
     private String projectTypeName;
 
-    public String getProjectTypeName(){
-        if(Objects.nonNull(this.projectType)){
+    public String getProjectTypeName() {
+        if (Objects.nonNull(this.projectType)) {
             Optional.ofNullable(ProjectTypeEnum.getDesc(this.projectType))
                     .ifPresent(desc -> this.projectTypeName = desc);
         }
         return this.projectTypeName;
     }
 
-    public void buildDynamicForm(String dynamicFormStr){
-        if(StringUtils.isNotBlank(dynamicFormStr) && BizUtils.getJSONType(dynamicFormStr)){
-            this.dynamicForm =  JSON.parseObject(dynamicFormStr,Map.class);
+    public void buildDynamicForm(String dynamicFormStr) {
+        if (StringUtils.isNotBlank(dynamicFormStr) && BizUtils.getJSONType(dynamicFormStr)) {
+            this.dynamicForm = JSON.parseObject(dynamicFormStr, Map.class);
         }
     }
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/IProjectInstService.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.projectlib.service;
+
+import com.ningdatech.pmapi.projectlib.model.entity.ProjectInst;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Poffy
+ * @since 2023-02-13
+ */
+public interface IProjectInstService extends IService<ProjectInst> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/impl/ProjectInstServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.projectlib.service.impl;
+
+import com.ningdatech.pmapi.projectlib.model.entity.ProjectInst;
+import com.ningdatech.pmapi.projectlib.mapper.ProjectInstMapper;
+import com.ningdatech.pmapi.projectlib.service.IProjectInstService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Poffy
+ * @since 2023-02-13
+ */
+@Service
+public class ProjectInstServiceImpl extends ServiceImpl<ProjectInstMapper, ProjectInst> implements IProjectInstService {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/InitProcessTask.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.pmapi.scheduler.contants.TaskContant;
 import com.ningdatech.pmapi.sys.contant.RegionConst;
-import com.ningdatech.pmapi.sys.entity.Region;
+import com.ningdatech.pmapi.sys.model.entity.Region;
 import com.ningdatech.pmapi.sys.service.IRegionService;
 import com.wflow.bean.dto.WflowModelHistorysDto;
 import com.wflow.bean.entity.WflowModels;

pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/MenuController.java

@@ -7,13 +7,13 @@ import com.ningdatech.basic.auth.AbstractLoginUserUtil;
 import com.ningdatech.basic.util.CollUtils;
 import com.ningdatech.log.annotation.WebLog;
 import com.ningdatech.pmapi.common.model.entity.MenuTreeEntity;
-import com.ningdatech.pmapi.common.utils.TreeUtil;
-import com.ningdatech.pmapi.sys.entity.Menu;
-import com.ningdatech.pmapi.sys.entity.dto.MenuQueryDTO;
-import com.ningdatech.pmapi.sys.entity.dto.MenuSaveDTO;
-import com.ningdatech.pmapi.sys.entity.dto.MenuUpdateDTO;
-import com.ningdatech.pmapi.sys.entity.vo.MenuRoleVO;
-import com.ningdatech.pmapi.sys.entity.vo.MenuVO;
+import com.ningdatech.pmapi.common.util.TreeUtil;
+import com.ningdatech.pmapi.sys.model.entity.Menu;
+import com.ningdatech.pmapi.sys.model.dto.MenuQueryDTO;
+import com.ningdatech.pmapi.sys.model.dto.MenuSaveDTO;
+import com.ningdatech.pmapi.sys.model.dto.MenuUpdateDTO;
+import com.ningdatech.pmapi.sys.model.vo.MenuRoleVO;
+import com.ningdatech.pmapi.sys.model.vo.MenuVO;
 import com.ningdatech.pmapi.sys.manage.MenuManage;
 import com.ningdatech.pmapi.sys.service.IMenuService;
 import com.ningdatech.pmapi.user.util.LoginUserUtil;

pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/NoticeController.java

@@ -3,11 +3,11 @@ package com.ningdatech.pmapi.sys.controller;
 import com.ningdatech.basic.model.IdVo;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.log.annotation.WebLog;
-import com.ningdatech.pmapi.sys.entity.req.NoticeListReq;
-import com.ningdatech.pmapi.sys.entity.req.NoticeSaveReq;
-import com.ningdatech.pmapi.sys.entity.req.NoticeStatusModifyReq;
-import com.ningdatech.pmapi.sys.entity.vo.NoticeDetailVO;
-import com.ningdatech.pmapi.sys.entity.vo.NoticeListItemVO;
+import com.ningdatech.pmapi.sys.model.req.NoticeListReq;
+import com.ningdatech.pmapi.sys.model.req.NoticeSaveReq;
+import com.ningdatech.pmapi.sys.model.req.NoticeStatusModifyReq;
+import com.ningdatech.pmapi.sys.model.vo.NoticeDetailVO;
+import com.ningdatech.pmapi.sys.model.vo.NoticeListItemVO;
 import com.ningdatech.pmapi.sys.manage.NoticeManage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/RoleController.java

@@ -4,11 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Assert;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.log.annotation.WebLog;
-import com.ningdatech.pmapi.sys.entity.Role;
-import com.ningdatech.pmapi.sys.entity.dto.RolePageReq;
-import com.ningdatech.pmapi.sys.entity.dto.RoleSaveDTO;
-import com.ningdatech.pmapi.sys.entity.dto.RoleUpdateDTO;
-import com.ningdatech.pmapi.sys.entity.vo.RoleVO;
+import com.ningdatech.pmapi.sys.model.entity.Role;
+import com.ningdatech.pmapi.sys.model.req.RolePageReq;
+import com.ningdatech.pmapi.sys.model.dto.RoleSaveDTO;
+import com.ningdatech.pmapi.sys.model.dto.RoleUpdateDTO;
+import com.ningdatech.pmapi.sys.model.vo.RoleVO;
 import com.ningdatech.pmapi.sys.manage.RoleManage;
 import com.ningdatech.pmapi.sys.service.IRoleService;
 import com.ningdatech.pmapi.user.util.LoginUserUtil;

pmapi/src/main/java/com/ningdatech/pmapi/sys/convert/RegionConverter.java

@@ -1,13 +1,10 @@
 package com.ningdatech.pmapi.sys.convert;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.ningdatech.basic.util.CollUtils;
-import com.ningdatech.pmapi.sys.entity.Region;
-import com.ningdatech.pmapi.sys.entity.dto.RegionDTO;
-import com.ningdatech.pmapi.sys.entity.dto.RegionTreeDTO;
-import com.ningdatech.pmapi.sys.entity.vo.RegionTreeVO;
+import com.ningdatech.pmapi.sys.model.entity.Region;
+import com.ningdatech.pmapi.sys.model.dto.RegionDTO;
+import com.ningdatech.pmapi.sys.model.dto.RegionTreeDTO;
+import com.ningdatech.pmapi.sys.model.vo.RegionTreeVO;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.ArrayList;
 import java.util.Collections;

pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/MenuManage.java

@@ -4,10 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.basic.util.CollUtils;
-import com.ningdatech.pmapi.common.utils.TreeUtil;
-import com.ningdatech.pmapi.sys.entity.Menu;
-import com.ningdatech.pmapi.sys.entity.RoleMenu;
-import com.ningdatech.pmapi.sys.entity.vo.MenuRoleVO;
+import com.ningdatech.pmapi.common.util.TreeUtil;
+import com.ningdatech.pmapi.sys.model.entity.Menu;
+import com.ningdatech.pmapi.sys.model.entity.RoleMenu;
+import com.ningdatech.pmapi.sys.model.vo.MenuRoleVO;
 import com.ningdatech.pmapi.sys.service.IRoleMenuService;
 import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails;
 import lombok.RequiredArgsConstructor;

pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/NoticeManage.java

@@ -10,13 +10,13 @@ import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.basic.util.CollUtils;
 import com.ningdatech.file.entity.vo.result.AttachFileVo;
 import com.ningdatech.file.service.FileService;
-import com.ningdatech.pmapi.common.utils.BizUtils;
-import com.ningdatech.pmapi.sys.entity.Notice;
-import com.ningdatech.pmapi.sys.entity.req.NoticeListReq;
-import com.ningdatech.pmapi.sys.entity.req.NoticeSaveReq;
-import com.ningdatech.pmapi.sys.entity.req.NoticeStatusModifyReq;
-import com.ningdatech.pmapi.sys.entity.vo.NoticeDetailVO;
-import com.ningdatech.pmapi.sys.entity.vo.NoticeListItemVO;
+import com.ningdatech.pmapi.common.util.BizUtils;
+import com.ningdatech.pmapi.sys.model.entity.Notice;
+import com.ningdatech.pmapi.sys.model.req.NoticeListReq;
+import com.ningdatech.pmapi.sys.model.req.NoticeSaveReq;
+import com.ningdatech.pmapi.sys.model.req.NoticeStatusModifyReq;
+import com.ningdatech.pmapi.sys.model.vo.NoticeDetailVO;
+import com.ningdatech.pmapi.sys.model.vo.NoticeListItemVO;
 import com.ningdatech.pmapi.sys.service.INoticeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;

pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/RegionManage.java

@@ -2,8 +2,8 @@ package com.ningdatech.pmapi.sys.manage;
 
 import com.ningdatech.basic.util.CollUtils;
 import com.ningdatech.pmapi.sys.convert.RegionConverter;
-import com.ningdatech.pmapi.sys.entity.dto.RegionDTO;
-import com.ningdatech.pmapi.sys.entity.vo.RegionTreeVO;
+import com.ningdatech.pmapi.sys.model.dto.RegionDTO;
+import com.ningdatech.pmapi.sys.model.vo.RegionTreeVO;
 import com.ningdatech.pmapi.sys.service.IRegionService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;

pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/RoleManage.java

@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.basic.util.CollUtils;
-import com.ningdatech.pmapi.sys.entity.Menu;
-import com.ningdatech.pmapi.sys.entity.Role;
-import com.ningdatech.pmapi.sys.entity.RoleMenu;
-import com.ningdatech.pmapi.sys.entity.dto.RolePageReq;
-import com.ningdatech.pmapi.sys.entity.vo.MenuRoleVO;
-import com.ningdatech.pmapi.sys.entity.vo.RoleVO;
+import com.ningdatech.pmapi.sys.model.entity.Menu;
+import com.ningdatech.pmapi.sys.model.entity.Role;
+import com.ningdatech.pmapi.sys.model.entity.RoleMenu;
+import com.ningdatech.pmapi.sys.model.req.RolePageReq;
+import com.ningdatech.pmapi.sys.model.vo.MenuRoleVO;
+import com.ningdatech.pmapi.sys.model.vo.RoleVO;
 import com.ningdatech.pmapi.sys.service.IRoleMenuService;
 import com.ningdatech.pmapi.sys.service.IMenuService;
 import com.ningdatech.pmapi.sys.service.IRoleService;

pmapi/src/main/java/com/ningdatech/pmapi/sys/mapper/MenuMapper.java

@@ -1,7 +1,7 @@
 package com.ningdatech.pmapi.sys.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ningdatech.pmapi.sys.entity.Menu;
+import com.ningdatech.pmapi.sys.model.entity.Menu;
 import org.springframework.stereotype.Repository;
 
 /**

pmapi/src/main/java/com/ningdatech/pmapi/sys/mapper/NoticeMapper.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/mapper/RegionMapper.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/mapper/ResourceMapper.java

@@ -1,8 +1,8 @@
 package com.ningdatech.pmapi.sys.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ningdatech.pmapi.sys.entity.Resource;
-import com.ningdatech.pmapi.sys.entity.dto.ResourceQueryDTO;
+import com.ningdatech.pmapi.sys.model.entity.Resource;
+import com.ningdatech.pmapi.sys.model.dto.ResourceQueryDTO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

pmapi/src/main/java/com/ningdatech/pmapi/sys/mapper/ResourceMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.ningdatech.pmapi.sys.mapper.ResourceMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ningdatech.pmapi.sys.entity.Resource">
+    <resultMap id="BaseResultMap" type="com.ningdatech.pmapi.sys.model.entity.Resource">
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="created_by" jdbcType="BIGINT" property="createBy"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createOn"/>
@@ -35,7 +35,7 @@
         )
     </select>
 
-    <insert id="saveOrUpdateUnique" parameterType="com.ningdatech.pmapi.sys.entity.Resource">
+    <insert id="saveOrUpdateUnique" parameterType="com.ningdatech.pmapi.sys.model.entity.Resource">
     insert into nd_resource ( id, created_by, create_time, updated_by, update_time,
         code, name, menu_id, describe_)
     values (#{id,jdbcType=BIGINT}, #{createUser,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP},#{updateUser,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP},

pmapi/src/main/java/com/ningdatech/pmapi/sys/mapper/RoleMapper.java

@@ -1,7 +1,7 @@
 package com.ningdatech.pmapi.sys.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ningdatech.pmapi.sys.entity.Role;
+import com.ningdatech.pmapi.sys.model.entity.Role;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

pmapi/src/main/java/com/ningdatech/pmapi/sys/mapper/RoleMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.ningdatech.pmapi.sys.mapper.RoleMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ningdatech.pmapi.sys.entity.Role">
+    <resultMap id="BaseResultMap" type="com.ningdatech.pmapi.sys.model.entity.Role">
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="created_by" jdbcType="BIGINT" property="createBy"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createOn"/>

pmapi/src/main/java/com/ningdatech/pmapi/sys/mapper/RoleMenuDatascopeMapper.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/mapper/RoleMenuMapper.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/mapper/UserRoleMapper.java

@@ -1,7 +1,7 @@
 package com.ningdatech.pmapi.sys.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ningdatech.pmapi.sys.entity.UserRole;
+import com.ningdatech.pmapi.sys.model.entity.UserRole;
 import org.springframework.stereotype.Repository;
 
 /**

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/MenuDataScopeDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/MenuDataScopeDTO.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/MenuQueryDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/MenuQueryDTO.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/MenuSaveDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/MenuSaveDTO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.dto;
+package com.ningdatech.pmapi.sys.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -6,7 +6,6 @@ import lombok.*;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/MenuUpdateDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/MenuUpdateDTO.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/RegionDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/RegionDTO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.dto;
+package com.ningdatech.pmapi.sys.model.dto;
 
 import lombok.Builder;
 import lombok.Data;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/RegionTreeDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/RegionTreeDTO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.dto;
+package com.ningdatech.pmapi.sys.model.dto;
 
 import lombok.Data;
 

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/ResourceQueryDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/ResourceQueryDTO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.dto;
+package com.ningdatech.pmapi.sys.model.dto;
 
 
 import io.swagger.annotations.ApiModel;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/ResourceSaveDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/ResourceSaveDTO.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/ResourceUpdateDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/ResourceUpdateDTO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.dto;
+package com.ningdatech.pmapi.sys.model.dto;
 
 import com.baomidou.mybatisplus.core.conditions.update.Update;
 import io.swagger.annotations.ApiModel;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/RoleAuthoritySaveDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/RoleAuthoritySaveDTO.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/RoleQueryDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/RoleQueryDTO.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/RoleSaveDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/RoleSaveDTO.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/RoleUpdateDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/RoleUpdateDTO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.dto;
+package com.ningdatech.pmapi.sys.model.dto;
 
 import com.baomidou.mybatisplus.core.conditions.update.Update;
 import io.swagger.annotations.ApiModel;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/UserRoleSaveDTO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/dto/UserRoleSaveDTO.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/BaseEntity.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/BaseEntity.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/Menu.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/Menu.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity;
+package com.ningdatech.pmapi.sys.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/Notice.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/Notice.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/Region.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/Region.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/Resource.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/Resource.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity;
+package com.ningdatech.pmapi.sys.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/Role.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/Role.java

@@ -1,7 +1,6 @@
-package com.ningdatech.pmapi.sys.entity;
+package com.ningdatech.pmapi.sys.model.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 io.swagger.annotations.ApiModel;
@@ -9,11 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Size;
-
-import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
-
 /**
  * <p>
  * 实体类

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/RoleAuthority.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/RoleAuthority.java

@@ -1,8 +1,8 @@
-package com.ningdatech.pmapi.sys.entity;
+package com.ningdatech.pmapi.sys.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ningdatech.pmapi.sys.entity.enumeration.AuthorizeType;
+import com.ningdatech.pmapi.sys.model.enumeration.AuthorizeTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -48,7 +48,7 @@ public class RoleAuthority extends BaseEntity {
     @ApiModelProperty(value = "权限类型")
     @NotNull(message = "权限类型不能为空")
     @TableField("authority_type")
-    private AuthorizeType authorityType;
+    private AuthorizeTypeEnum authorityType;
 
     /**
      * 角色id
@@ -62,7 +62,7 @@ public class RoleAuthority extends BaseEntity {
 
     @Builder
     public RoleAuthority(Long id, LocalDateTime createTime, Long createdBy,
-                         Long authorityId, AuthorizeType authorityType, Long roleId) {
+                         Long authorityId, AuthorizeTypeEnum authorityType, Long roleId) {
         this.id = id;
         this.createOn = createTime;
         this.createBy = createdBy;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/RoleMenu.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/RoleMenu.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/RoleMenuDatascope.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/RoleMenuDatascope.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/UserRole.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/entity/UserRole.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/enumeration/AuthorizeType.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/enumeration/AuthorizeTypeEnum.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.enumeration;
+package com.ningdatech.pmapi.sys.model.enumeration;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,7 +21,7 @@ import java.util.stream.Stream;
 @AllArgsConstructor
 @NoArgsConstructor
 @ApiModel(value = "AuthorizeType", description = "权限类型-枚举")
-public enum AuthorizeType {
+public enum AuthorizeTypeEnum {
 
     /**
      * MENU="菜单"
@@ -40,15 +40,15 @@ public enum AuthorizeType {
     /**
      * 根据当前枚举的name匹配
      */
-    public static AuthorizeType match(String val, AuthorizeType def) {
+    public static AuthorizeTypeEnum match(String val, AuthorizeTypeEnum def) {
         return Stream.of(values()).parallel().filter(item -> item.name().equalsIgnoreCase(val)).findAny().orElse(def);
     }
 
-    public static AuthorizeType get(String val) {
+    public static AuthorizeTypeEnum get(String val) {
         return match(val, null);
     }
 
-    public boolean eq(AuthorizeType val) {
+    public boolean eq(AuthorizeTypeEnum val) {
         return val != null && getCode().equals(val.name());
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/enumeration/DataScopeEnum.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/enumeration/DataScopeEnum.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.enumeration;
+package com.ningdatech.pmapi.sys.model.enumeration;
 
 import lombok.Getter;
 

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/enumeration/MenuTypeEnum.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/enumeration/MenuTypeEnum.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.enumeration;
+package com.ningdatech.pmapi.sys.model.enumeration;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/req/NoticeListReq.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/req/NoticeListReq.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.req;
+package com.ningdatech.pmapi.sys.model.req;
 
 import com.ningdatech.basic.model.PagePo;
 import io.swagger.annotations.ApiModel;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/req/NoticeSaveReq.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/req/NoticeSaveReq.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/req/NoticeStatusModifyReq.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/req/NoticeStatusModifyReq.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/RolePageReq.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/req/RolePageReq.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.dto;
+package com.ningdatech.pmapi.sys.model.req;
 
 import com.ningdatech.basic.model.PagePo;
 import io.swagger.annotations.ApiModel;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/vo/MenuResourceTreeVO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/vo/MenuResourceTreeVO.java

@@ -1,7 +1,7 @@
-package com.ningdatech.pmapi.sys.entity.vo;
+package com.ningdatech.pmapi.sys.model.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.ningdatech.pmapi.sys.entity.enumeration.AuthorizeType;
+import com.ningdatech.pmapi.sys.model.enumeration.AuthorizeTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
@@ -20,7 +20,7 @@ import static com.baomidou.mybatisplus.annotation.SqlCondition.LIKE;
 @ToString(callSuper = true)
 public class MenuResourceTreeVO {
 
-    private AuthorizeType type;
+    private AuthorizeTypeEnum type;
     private String code;
     private String icon;
     private Boolean isDef;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/vo/MenuRoleVO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/vo/MenuRoleVO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.vo;
+package com.ningdatech.pmapi.sys.model.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.ningdatech.pmapi.common.model.entity.MenuTreeEntity;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/vo/MenuVO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/vo/MenuVO.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/vo/NoticeDetailVO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/vo/NoticeDetailVO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.vo;
+package com.ningdatech.pmapi.sys.model.vo;
 
 import com.ningdatech.file.entity.vo.result.AttachFileVo;
 import io.swagger.annotations.ApiModel;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/vo/NoticeListItemVO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/vo/NoticeListItemVO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.vo;
+package com.ningdatech.pmapi.sys.model.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/vo/RegionTreeVO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/vo/RegionTreeVO.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/dto/RoleUserSaveVO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/vo/RoleUserSaveVO.java

@@ -1,4 +1,4 @@
-package com.ningdatech.pmapi.sys.entity.dto;
+package com.ningdatech.pmapi.sys.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

pmapi/src/main/java/com/ningdatech/pmapi/sys/entity/vo/RoleVO.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/model/vo/RoleVO.java

@@ -1,6 +1,6 @@
-package com.ningdatech.pmapi.sys.entity.vo;
+package com.ningdatech.pmapi.sys.model.vo;
 
-import com.ningdatech.pmapi.sys.entity.BaseEntity;
+import com.ningdatech.pmapi.sys.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/IMenuService.java

@@ -1,9 +1,9 @@
 package com.ningdatech.pmapi.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ningdatech.pmapi.sys.entity.Menu;
-import com.ningdatech.pmapi.sys.entity.dto.MenuSaveDTO;
-import com.ningdatech.pmapi.sys.entity.dto.MenuUpdateDTO;
+import com.ningdatech.pmapi.sys.model.entity.Menu;
+import com.ningdatech.pmapi.sys.model.dto.MenuSaveDTO;
+import com.ningdatech.pmapi.sys.model.dto.MenuUpdateDTO;
 
 import java.util.List;
 

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/INoticeService.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/IRegionService.java

@@ -1,8 +1,8 @@
 package com.ningdatech.pmapi.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ningdatech.pmapi.sys.entity.Region;
-import com.ningdatech.pmapi.sys.entity.dto.RegionDTO;
+import com.ningdatech.pmapi.sys.model.entity.Region;
+import com.ningdatech.pmapi.sys.model.dto.RegionDTO;
 
 import java.util.List;
 

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/IRoleMenuDatascopeService.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/IRoleMenuService.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/IRoleService.java

@@ -1,9 +1,9 @@
 package com.ningdatech.pmapi.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ningdatech.pmapi.sys.entity.Role;
-import com.ningdatech.pmapi.sys.entity.dto.RoleSaveDTO;
-import com.ningdatech.pmapi.sys.entity.dto.RoleUpdateDTO;
+import com.ningdatech.pmapi.sys.model.entity.Role;
+import com.ningdatech.pmapi.sys.model.dto.RoleSaveDTO;
+import com.ningdatech.pmapi.sys.model.dto.RoleUpdateDTO;
 
 import java.util.List;
 

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/IUserRoleService.java

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

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/MenuServiceImpl.java

@@ -12,10 +12,10 @@ import com.google.common.collect.Lists;
 import com.ningdatech.basic.exception.BaseUncheckedException;
 import com.ningdatech.basic.util.ValidatorUtil;
 import com.ningdatech.pmapi.common.constant.DefValConstants;
-import com.ningdatech.pmapi.sys.entity.Menu;
-import com.ningdatech.pmapi.sys.entity.enumeration.MenuTypeEnum;
-import com.ningdatech.pmapi.sys.entity.dto.MenuSaveDTO;
-import com.ningdatech.pmapi.sys.entity.dto.MenuUpdateDTO;
+import com.ningdatech.pmapi.sys.model.entity.Menu;
+import com.ningdatech.pmapi.sys.model.enumeration.MenuTypeEnum;
+import com.ningdatech.pmapi.sys.model.dto.MenuSaveDTO;
+import com.ningdatech.pmapi.sys.model.dto.MenuUpdateDTO;
 import com.ningdatech.pmapi.sys.mapper.MenuMapper;
 import com.ningdatech.pmapi.sys.service.IMenuService;
 import lombok.RequiredArgsConstructor;

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/NoticeServiceImpl.java

@@ -1,7 +1,7 @@
 package com.ningdatech.pmapi.sys.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ningdatech.pmapi.sys.entity.Notice;
+import com.ningdatech.pmapi.sys.model.entity.Notice;
 import com.ningdatech.pmapi.sys.mapper.NoticeMapper;
 import com.ningdatech.pmapi.sys.service.INoticeService;
 import org.springframework.stereotype.Service;

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/RegionServiceImpl.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ningdatech.basic.util.CollUtils;
 import com.ningdatech.pmapi.sys.convert.RegionConverter;
-import com.ningdatech.pmapi.sys.entity.Region;
-import com.ningdatech.pmapi.sys.entity.dto.RegionDTO;
+import com.ningdatech.pmapi.sys.model.entity.Region;
+import com.ningdatech.pmapi.sys.model.dto.RegionDTO;
 import com.ningdatech.pmapi.sys.mapper.RegionMapper;
 import com.ningdatech.pmapi.sys.service.IRegionService;
 import org.springframework.stereotype.Service;

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/RoleMenuDatascopeServiceImpl.java

@@ -1,6 +1,6 @@
 package com.ningdatech.pmapi.sys.service.impl;
 
-import com.ningdatech.pmapi.sys.entity.RoleMenuDatascope;
+import com.ningdatech.pmapi.sys.model.entity.RoleMenuDatascope;
 import com.ningdatech.pmapi.sys.mapper.RoleMenuDatascopeMapper;
 import com.ningdatech.pmapi.sys.service.IRoleMenuDatascopeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/RoleMenuServiceImpl.java

@@ -1,7 +1,7 @@
 package com.ningdatech.pmapi.sys.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ningdatech.pmapi.sys.entity.RoleMenu;
+import com.ningdatech.pmapi.sys.model.entity.RoleMenu;
 import com.ningdatech.pmapi.sys.mapper.RoleMenuMapper;
 import com.ningdatech.pmapi.sys.service.IRoleMenuService;
 import org.springframework.stereotype.Service;

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/RoleServiceImpl.java

@@ -12,11 +12,11 @@ import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.exception.code.ExceptionCode;
 import com.ningdatech.basic.util.CollUtils;
 import com.ningdatech.cache.repository.CachePlusOps;
-import com.ningdatech.pmapi.sys.entity.*;
-import com.ningdatech.pmapi.sys.entity.dto.MenuDataScopeDTO;
-import com.ningdatech.pmapi.sys.entity.dto.RoleSaveDTO;
-import com.ningdatech.pmapi.sys.entity.dto.RoleUpdateDTO;
+import com.ningdatech.pmapi.sys.model.dto.MenuDataScopeDTO;
+import com.ningdatech.pmapi.sys.model.dto.RoleSaveDTO;
+import com.ningdatech.pmapi.sys.model.dto.RoleUpdateDTO;
 import com.ningdatech.pmapi.sys.mapper.RoleMapper;
+import com.ningdatech.pmapi.sys.model.entity.*;
 import com.ningdatech.pmapi.sys.service.*;
 import com.ningdatech.pmapi.sys.utils.AuthCacheKeyUtils;
 import lombok.RequiredArgsConstructor;

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/UserRoleServiceImpl.java

@@ -4,8 +4,8 @@ import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ningdatech.basic.exception.BaseUncheckedException;
-import com.ningdatech.pmapi.sys.entity.Role;
-import com.ningdatech.pmapi.sys.entity.UserRole;
+import com.ningdatech.pmapi.sys.model.entity.Role;
+import com.ningdatech.pmapi.sys.model.entity.UserRole;
 import com.ningdatech.pmapi.sys.mapper.RoleMapper;
 import com.ningdatech.pmapi.sys.mapper.UserRoleMapper;
 import com.ningdatech.pmapi.sys.service.IUserRoleService;

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java

@@ -7,8 +7,6 @@ import javax.validation.Valid;
 import com.ningdatech.pmapi.common.util.ExcelDownUtil;
 import com.ningdatech.pmapi.todocenter.bean.vo.ProcessProgressDetailVo;
 import com.ningdatech.pmapi.todocenter.model.dto.req.ReqProcessHandlerDTO;
-import com.wflow.utils.R;
-import com.wflow.workflow.bean.vo.ProcessHandlerParamsVo;
 import org.springframework.web.bind.annotation.*;
 
 import com.ningdatech.basic.model.ApiResponse;