Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldOperationDynamics.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-08-19
+ * @since 2019-08-20
  */
 @TableName("tb_mould_operation_dynamics")
 public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
@@ -81,6 +81,18 @@ public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
     @TableField("is_pass")
     private Integer isPass;
 
+    /**
+     * 申请人id
+     */
+    @TableField("applicant_id")
+    private Integer applicantId;
+
+    /**
+     * 申请人姓名
+     */
+    @TableField("applicant_name")
+    private String applicantName;
+
 
     public Integer getId() {
         return id;
@@ -162,6 +174,22 @@ public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
         this.isPass = isPass;
     }
 
+    public Integer getApplicantId() {
+        return applicantId;
+    }
+
+    public void setApplicantId(Integer applicantId) {
+        this.applicantId = applicantId;
+    }
+
+    public String getApplicantName() {
+        return applicantName;
+    }
+
+    public void setApplicantName(String applicantName) {
+        this.applicantName = applicantName;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -180,6 +208,8 @@ public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
         ", content=" + content +
         ", mouldId=" + mouldId +
         ", isPass=" + isPass +
+        ", applicantId=" + applicantId +
+        ", applicantName=" + applicantName +
         "}";
     }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/InvitationRecordServiceImpl.java

@@ -68,7 +68,7 @@ public class InvitationRecordServiceImpl extends ServiceImpl<InvitationRecordMap
                 invitationRecord.setOperator(user.getUsername());
                 invitationRecord.setOperatorId(user.getId());
                 invitationRecord.setInvitee(invitee.getUsername());
-                invitationRecord.setAddressUrl(invitationUrl+invitationRecord.getInviteeId()+"/"+invitationRecord.getProjectId());
+                invitationRecord.setAddressUrl(invitationUrl+invitationRecord.getInviteeId()+"/"+invitationRecord.getProjectId()+"/"+user.getId());
                 invitationRecordMapper.insert(invitationRecord);
                 BeanUtils.copyProperties(invitationRecord,vo);
                 msg.data = vo;

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_invitation_record");
+        strategy.setInclude("tb_mould_operation_dynamics");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

cloud-model/src/main/resources/mapper/MouldOperationDynamicsMapper.xml

@@ -14,11 +14,13 @@
         <result column="content" property="content" />
         <result column="mould_id" property="mouldId" />
         <result column="is_pass" property="isPass" />
+        <result column="applicant_id" property="applicantId" />
+        <result column="applicant_name" property="applicantName" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, file_id, operator_id, operator_name, indate, file_name, belong_type, content, mould_id, is_pass
+        id, file_id, operator_id, operator_name, indate, file_name, belong_type, content, mould_id, is_pass, applicant_id, applicant_name
     </sql>
 
 </mapper>