优化代码结构

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

@@ -11,31 +11,33 @@
         <result column="modify_before" property="modifyBefore" />
         <result column="reason" property="reason" />
         <result column="modify_time" property="modifyTime" />
+        <result column="reviser_id" property="reviserId"/>
+        <result column="operation_type" property="operationType"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_id, change_type, modify_after,modify_before, reason, modify_time
+        id, project_id, change_type, modify_after,modify_before, reason, modify_time,reviser_id,operation_type
     </sql>
 
     <sql id="not_id_Column_List">
-        project_id, change_type, modify_after,modify_before, reason, modify_time
+        project_id, change_type, modify_after,modify_before, reason, modify_time,reviser_id,operation_type
     </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.changeType},#{workProjectChange.modifyAfter},#{workProjectChange.modifyBefore},#{workProjectChange.reason},#{workProjectChange.modifyTime})
+            (#{workProjectChange.projectId}, #{workProjectChange.changeType},#{workProjectChange.modifyAfter},#{workProjectChange.modifyBefore},#{workProjectChange.reason},#{workProjectChange.modifyTime},#{workProjectChange.reviserId},#{workProjectChange.operationType})
         </foreach >
 
 
     </insert>
     <select id="getByProjectId" resultType="cn.wisenergy.model.app.WorkProjectChange">
-        SELECT <include refid="Base_Column_List"/>
-        FROM work_project_change
-        WHERE project_id = #{projectId}
-        ORDER BY modify_time DESC
+        SELECT c.id,c.project_id,c.change_type,c.modify_after,c.modify_before,c.reason,c.modify_time,c.reviser_id,c.operation_type,u.name as 'reviser_name'
+        FROM work_project_change c LEFT JOIN work_user u on c.reviser_id = u.id
+        WHERE c.project_id = #{projectId}
+        ORDER BY c.modify_time DESC
     </select>
 
 </mapper>

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

@@ -77,4 +77,7 @@ public class WorkProject implements Serializable {
 
     @ApiModelProperty(name = "conclusionTime",value = "结项时间")
     private Date conclusionTime;
+
+    @ApiModelProperty(name = "creatorId",value = "创建人id")
+    private Integer creatorId;
 }

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

 package cn.wisenergy.model.app;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -51,8 +52,19 @@ public class WorkProjectChange implements Serializable {
     @ApiModelProperty(name = "modify_time",value = "变更日期")
     private Date modifyTime;
 
+    @ApiModelProperty(name = "reviserId",value = "更变人id")
+    private Integer reviserId;
 
-    /** 附加字段 更变项名*/
+    @ApiModelProperty(name = "operationType",value = "1:新增 2:修改 3:结项")
+    private Integer operationType;
+
+
+    /** 附加字段 更变项名  变更人姓名*/
+    @TableField(exist = false)
     private String changeTypeName;
+    @TableField(exist = false)
+    private String reviserName;
+    @TableField(exist = false)
+    private String operationTypeName;
 
 }

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

@@ -12,6 +12,8 @@ public enum ChangeTypeEnum {
     MANAGER(5,"项目/商机负责人"),
     DEPARTMENT(6, "项目/商机所属部门"),
     PARTICIPANTS(7, "参与人员"),
+    PROJECT_NUMBER(8, "项目/商机编号"),
+    PROJECT_NAME(9, "项目/商机名称"),
     ;
 
 

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

+package cn.wisenergy.model.enums;
+
+/**
+ * @Authotr:陈奇
+ * @QQ1799796883
+ */
+public enum OperationTypeEnum {
+    ADD(1, "新增"),
+    MODIFY(2, "修改"),
+    END(3, "结项"),
+    ;
+
+
+    private Integer OperationType;
+    private String OperationTypeName;
+
+    OperationTypeEnum(Integer changeType, String changeTypeName) {
+        this.OperationType = changeType;
+        this.OperationTypeName = changeTypeName;
+    }
+
+    public Integer getChangeType() {
+        return OperationType;
+    }
+
+    public String getChangeTypeName() {
+        return OperationTypeName;
+    }}
\ No newline at end of file

wisenergy-model/src/main/java/cn/wisenergy/model/vo/CreateProjectVo.java

@@ -25,6 +25,9 @@ public class CreateProjectVo {
     @ApiModelProperty(name = "projectName",value = "项目名称")
     private String projectName;
 
+    @ApiModelProperty(name = "creatorId",value = "创建人id")
+    private Integer creatorId;
+
     @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd")
     @ApiModelProperty(name = "startTime",value = "项目开始时间")
     private Date startTime;

wisenergy-model/src/main/java/cn/wisenergy/model/vo/ModifyProjectVo.java

@@ -53,4 +53,15 @@ public class ModifyProjectVo {
     private String businessId;
 
     private String businessName;
+
+    private String oaProjectId;
+
+    private String oaProjectIdReason;
+
+    private String projectName;
+
+    private String projectNameReason;
+
+    //变更人Id
+    private Integer reviserId;
 }

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

@@ -5,7 +5,9 @@ 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.model.enums.OperationTypeEnum;
 import cn.wisenergy.service.WorkProjectChangeService;
+import cn.wisenergy.service.WorkUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +30,9 @@ public class WorkProjectChangeServiceImpl implements WorkProjectChangeService {
     @Autowired
     private WorkProjectChangeMapper workProjectChangeMapper;
 
+    @Autowired
+    private WorkUserService workUserService;
+
     /**
      * 批量插入
      *
@@ -67,7 +72,15 @@ public class WorkProjectChangeServiceImpl implements WorkProjectChangeService {
                     workProjectChange.setChangeTypeName(value.getChangeTypeName());
                 }
             }
+            for (OperationTypeEnum value : OperationTypeEnum.values()) {
+                if (value.getChangeType().equals(workProjectChange.getOperationType())) {
+                    workProjectChange.setOperationTypeName(value.getChangeTypeName());
+                }
+            }
         }
+
+
+
         return workProjectChanges;
     }
 }