user列表

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

@@ -16,7 +16,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-07-29
+ * @since 2019-07-31
  */
 @TableName("tb_project")
 public class Project extends Model<Project> {
@@ -80,25 +80,25 @@ public class Project extends Model<Project> {
     private Integer isDelete;
 
     /**
-     * 本项目公司id
+     * 模具资产方公司id
      */
     @TableField("owner_company")
     private Integer ownerCompany;
 
     /**
-     * 本项目公司名称
+     * 模具资产方公司名称
      */
     @TableField("owner_company_name")
     private String ownerCompanyName;
 
     /**
-     * 客户方公司id
+     * 模具生产方公司id
      */
     @TableField("customer_company")
     private Integer customerCompany;
 
     /**
-     * 客户方公司名称
+     * 模具生产方公司名称
      */
     @TableField("customer_company_name")
     private String customerCompanyName;
@@ -111,16 +111,16 @@ public class Project extends Model<Project> {
     private LocalDateTime indate;
 
     /**
-     * 负责人id
+     * 项目经理id
      */
-    @TableField("charger_id")
-    private Integer chargerId;
+    @TableField("manager_id")
+    private Integer managerId;
 
     /**
-     * 负责人名字
+     * 项目经理名字
      */
-    @TableField("charger")
-    private String charger;
+    @TableField("manager")
+    private String manager;
 
 
     public Integer getId() {
@@ -235,20 +235,20 @@ public class Project extends Model<Project> {
         this.indate = indate;
     }
 
-    public Integer getChargerId() {
-        return chargerId;
+    public Integer getManagerId() {
+        return managerId;
     }
 
-    public void setChargerId(Integer chargerId) {
-        this.chargerId = chargerId;
+    public void setManagerId(Integer managerId) {
+        this.managerId = managerId;
     }
 
-    public String getCharger() {
-        return charger;
+    public String getManager() {
+        return manager;
     }
 
-    public void setCharger(String charger) {
-        this.charger = charger;
+    public void setManager(String manager) {
+        this.manager = manager;
     }
 
     @Override
@@ -273,8 +273,8 @@ public class Project extends Model<Project> {
         ", customerCompany=" + customerCompany +
         ", customerCompanyName=" + customerCompanyName +
         ", indate=" + indate +
-        ", chargerId=" + chargerId +
-        ", charger=" + charger +
+        ", managerId=" + managerId +
+        ", manager=" + manager +
         "}";
     }
 }

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

@@ -80,13 +80,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 user.setPassword(MD5Util.getPassword("000000"));
                 user.setHeadImgurl(UUID.randomUUID().toString().replaceAll("-", ""));
                 //获取角色所属的团体
-//                Role role = roleMapper.selectById(user.getRoleType());
-//                if("客户".equals(role.getSubordinate())){
-//                    user.setSubordinateType(1);
-//                }else if("供应商".equals(role.getSubordinate())){
-//                    user.setSubordinateType(0);
-//                }
-//                user.setTeamName(role.getSubordinate());
+                if("资产方".equals(user.getTeamName())){
+                    user.setSubordinateType(0);
+                }else if("生产方".equals(user.getTeamName())){
+                    user.setSubordinateType(1);
+                }
                 userMapper.insert(user);
             }
         } else if (flag == 1) {

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_mould");
+        strategy.setInclude("tb_project");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -18,10 +18,15 @@
         <result column="customer_company" property="customerCompany" />
         <result column="customer_company_name" property="customerCompanyName" />
         <result column="indate" property="indate" />
-        <result column="charger_id" property="chargerId" />
-        <result column="charger" property="charger" />
+        <result column="manager_id" property="managerId" />
+        <result column="manager" property="manager" />
     </resultMap>
 
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, project_name, project_no, start_time, end_time, content, creator_id, creator, is_delete, owner_company, owner_company_name, customer_company, customer_company_name, indate, manager_id, manager
+    </sql>
+
     <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.ProjectVO">
         <id column="id" property="id" />
         <result column="project_name" property="projectName" />
@@ -32,8 +37,8 @@
         <result column="customer_company" property="customerCompany" />
         <result column="customer_company_name" property="customerCompanyName" />
         <result column="indate" property="indate" />
-        <result column="charger_id" property="chargerId" />
-        <result column="charger" property="charger" />
+        <result column="manager_id" property="managerId" />
+        <result column="manager" property="manager" />
         <collection property="models" ofType="com.hssx.cloudmodel.entity.Mould">
             <id column="id" property="id" />
             <result column="model_no" property="modelNo" />
@@ -41,23 +46,18 @@
         </collection>
     </resultMap>
 
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, project_name, project_no, start_time, end_time, content, creator_id, creator, is_delete, owner_company, owner_company_name, customer_company, customer_company_name, indate, charger_id, charger
-    </sql>
-
     <select id="getProjectListByUid" resultMap="BaseResultMap">
         select
         p.id id,p.project_name project_name, p.creator creator,p.owner_company owner_company,
         p.owner_company_name owner_company_name,p.customer_company customer_company,
         p.customer_company_name customer_company_name,p.charger charger,p.indate indate
         from
-           tb_project p
+        tb_project p
         left join tb_project_user pu
         on p.id = pu.project_id
         <where>
             <if test="currentUser.id != 1">
-            pu.user_id = #{currentUser.id}
+                pu.user_id = #{currentUser.id}
             </if>
             <if test="keyName != null and keyName != ''">
                 p.project_name like concat('%',#{keyName},'%')
@@ -99,4 +99,5 @@
         where
           pu.project_id = #{id}
     </select>
+
 </mapper>