优化代码结构

wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java

@@ -72,7 +72,7 @@ public enum BASE_RESP_CODE_ENUM {
     REASON_CANNOT_BE_EMPTY("650", "更变原因不能为空"),
     START_NOT_THAN_END_DATE("651", "开始时间不能大于结束时间"),
     HOLIDAY_NOT_IS_NULL("652", "该节假日已经不存在，请刷新页面!"),
-    ORDINARY_MEMBERS_ARE_MANAGEMENT("653", "普通成员不能有管理角色,请取消普通成员选项"),
+    ORDINARY_MEMBERS_ARE_MANAGEMENT("653", "普通成员不能有管理角色"),
     REPEAT_WITH_OLDTIME("654", "日期与旧时间冲突"),
     BUDGET_CANNOT_BELESSTHAN_ZERO("655", "预算不能小于0"),
     ITEMOADUPLICATE("656", "项目OA重复"),

wisenergy-mapper/src/main/resources/mapper/WorkProjectChangeMapper.xml

@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkProjectChange">
         <id column="id" property="id" />
         <result column="project_id" property="projectId" />
-        <result column="type" property="type" />
+        <result column="change_type" property="changeType" />
         <result column="modify_after" property="modifyAfter" />
         <result column="modify_before" property="modifyBefore" />
         <result column="reason" property="reason" />
@@ -15,18 +15,18 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_id, `type`, modify_after,modify_before, reason, modify_time
+        id, project_id, change_type, modify_after,modify_before, reason, modify_time
     </sql>
 
     <sql id="not_id_Column_List">
-        project_id, `type`, modify_after,modify_before, reason, modify_time
+        project_id, change_type, modify_after,modify_before, reason, modify_time
     </sql>
     <insert id="insertBatch">
         INSERT INTO work_project_change
         (<include refid="not_id_Column_List"/> )
         VALUES
         <foreach collection ="workProjectChanges" item="workProjectChange" separator =",">
-            (#{workProjectChange.projectId}, #{workProjectChange.type},#{workProjectChange.modifyAfter},#{workProjectChange.modifyBefore},#{workProjectChange.reason},#{workProjectChange.modifyTime})
+            (#{workProjectChange.projectId}, #{workProjectChange.changeType},#{workProjectChange.modifyAfter},#{workProjectChange.modifyBefore},#{workProjectChange.reason},#{workProjectChange.modifyTime})
         </foreach >
 
 

wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkProjectChange.java

@@ -35,8 +35,8 @@ public class WorkProjectChange implements Serializable {
     @ApiModelProperty(name = "projectId;",value = "项目编号")
     private Integer projectId;
 
-    @ApiModelProperty(name = "type",value = "1：成本预算变更，2：工时预算变更")
-    private Integer type;
+    @ApiModelProperty(name = "changeType",value = "1：成本预算变更，2：工时预算变更")
+    private Integer changeType;
 
     @ApiModelProperty(name = "modifyAfter",value = "修改后的预算")
     private String modifyAfter;
@@ -52,6 +52,7 @@ public class WorkProjectChange implements Serializable {
     private Date modifyTime;
 
 
-
+    /** 附加字段 更变项名*/
+    private String changeTypeName;
 
 }

wisenergy-model/src/main/java/cn/wisenergy/model/enums/ChangeTypeEnum.java

+package cn.wisenergy.model.enums;
+
+/**
+ * @Authotr:陈奇
+ * @QQ1799796883
+ */
+public enum ChangeTypeEnum {
+    COSTBUDGET(1, "成本预算"),
+    WORKINGHOURSBUDGET(2, "工时预算"),
+    STARTINGTIME(3, "开始时间"),
+    ENDTIME(4, "结束时间"),
+
+
+    ;
+
+
+    private Integer changeType;
+    private String changeTypeName;
+
+    ChangeTypeEnum(Integer changeType, String changeTypeName) {
+        this.changeType = changeType;
+        this.changeTypeName = changeTypeName;
+    }
+
+    public Integer getChangeType() {
+        return changeType;
+    }
+
+    public String getChangeTypeName() {
+        return changeTypeName;
+    }}

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectChangeServiceImpl.java

@@ -4,6 +4,7 @@ import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
 import cn.wisenergy.common.utils.exception.BaseCustomException;
 import cn.wisenergy.mapper.WorkProjectChangeMapper;
 import cn.wisenergy.model.app.WorkProjectChange;
+import cn.wisenergy.model.enums.ChangeTypeEnum;
 import cn.wisenergy.service.WorkProjectChangeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +60,14 @@ public class WorkProjectChangeServiceImpl implements WorkProjectChangeService {
         if (CollectionUtils.isEmpty(workProjectChanges)) {
             return null;
         }
+        // 给ChangeTypeName赋值
+        for (WorkProjectChange workProjectChange : workProjectChanges) {
+            for (ChangeTypeEnum value : ChangeTypeEnum.values()) {
+                if (value.getChangeType().equals(workProjectChange.getChangeType())) {
+                    workProjectChange.setChangeTypeName(value.getChangeTypeName());
+                }
+            }
+        }
         return workProjectChanges;
     }
 }

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java

@@ -318,28 +318,28 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             workProjectChange.setProjectId(modifyProjectVo.getProjectId());
             workProjectChange.setModifyTime(new Date());
             if (null != modifyProjectVo.getStartTimeReason()) {
-                workProjectChange.setType(3);
+                workProjectChange.setChangeType(3);
                 workProjectChange.setModifyBefore(DateUtil.convertDateToStr(modifyProjectVo.getStartTime(),"yyyy-MM-dd"));
                 workProjectChange.setModifyAfter(DateUtil.convertDateToStr(modifyProjectVo.getStartTime(),"yyyy-MM-dd"));
                 workProjectChange.setReason(modifyProjectVo.getStartTimeReason());
                 workProjectChanges.add(workProjectChange);
             }
             if (null != modifyProjectVo.getEndTime()) {
-                workProjectChange.setType(4);
+                workProjectChange.setChangeType(4);
                 workProjectChange.setModifyBefore(DateUtil.convertDateToStr(modifyProjectVo.getEndTime(),"yyyy-MM-dd"));
                 workProjectChange.setModifyAfter(modifyProjectVo.getEndTime().toString());
                 workProjectChange.setReason(modifyProjectVo.getEndTimeReason());
                 workProjectChanges.add(workProjectChange);
             }
             if (null != modifyProjectVo.getWorkTime()) {
-                workProjectChange.setType(2);
+                workProjectChange.setChangeType(2);
                 workProjectChange.setModifyBefore(workProject.getWorkTime().toString());
                 workProjectChange.setModifyAfter(modifyProjectVo.getWorkTime().toString());
                 workProjectChange.setReason(modifyProjectVo.getWorkTimeReason());
                 workProjectChanges.add(workProjectChange);
             }
             if (null != modifyProjectVo.getCostBudget()) {
-                workProjectChange.setType(1);
+                workProjectChange.setChangeType(1);
                 workProjectChange.setModifyBefore(workProject.getCostBudget().toString());
                 workProjectChange.setModifyAfter(modifyProjectVo.getCostBudget().toString());
                 workProjectChange.setReason(modifyProjectVo.getCostBudgetReason());

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java

@@ -151,7 +151,7 @@ public class WorkUserServiceImpl implements WorkUserService {
     public AllRoleAndUserRoleDto getUserRoleDto(Integer userId,Integer page, Integer pageSize) {
         log.info("WorkUserServiceImpl[]getUserRoleDto[]input.param.userId:{},page:{},pageSize:{}" + userId, page, pageSize);
         if (!UserRoleLevelUtils.isManagerLevel(userId, LevelEnum.ACCOUNTMANAGEMENT.getLevelName())) {
-            throw new BaseCustomException(BASE_RESP_CODE_ENUM.MANAGER_NOT_PROJECT);
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
         }
         page = page == null ? 1 : page;
         pageSize = pageSize == null ? 10 : pageSize;

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SystemController.java

@@ -79,7 +79,7 @@ public class SystemController extends BaseController {
     }
 
     @ApiOperation(value = "修改审批时限", notes = "修改审批时限", httpMethod = "PUT")
-    @ApiImplicitParam(name = "workSubmitAdopt",value = "审批时限",required = true)
+    @ApiImplicitParam(name = "workSubmitAdopt",value = "审批时限",dataType ="WorkSubmitAdopt", required = true)
     @PutMapping("/modifyAuto")
     public Result<Boolean> modifyAuto(@RequestBody WorkSubmitAdopt workSubmitAdopt) {
         log.info("SystemController[]modifyAuto[]input.param.workSubmitAdopt:{}" + workSubmitAdopt);

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkProjectController.java

@@ -42,7 +42,7 @@ public class WorkProjectController  extends BaseController {
     @PostMapping(value = "/getProject")
     public Result<PageInfo> getProject(@RequestBody GetManagerProjectsVo gmpv) {
         log.info("WorkProjectController[]getProject[]input.param.GetManagerProjectsVo:{}" + gmpv);
-        PageInfo<ManagerProjectsDto> managerProjeets = workProjectService.getManagerProjects(gmpv);
+        PageInfo managerProjeets = workProjectService.getManagerProjects(gmpv);
         return getResult(managerProjeets);
     }