user列表

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

@@ -14,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-07-30
+ * @since 2019-07-31
  */
 @TableName("tb_mould")
 public class Mould extends Model<Mould> {
@@ -141,6 +141,18 @@ public class Mould extends Model<Mould> {
     @TableField("initial_modulus")
     private Integer initialModulus;
 
+    /**
+     * 对应设备id
+     */
+    @TableField("equipment_id")
+    private Integer equipmentId;
+
+    /**
+     * 在项目中所属的部分如：1/10
+     */
+    @TableField("belong_project_grade")
+    private String belongProjectGrade;
+
 
     public Integer getId() {
         return id;
@@ -302,6 +314,22 @@ public class Mould extends Model<Mould> {
         this.initialModulus = initialModulus;
     }
 
+    public Integer getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(Integer equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public String getBelongProjectGrade() {
+        return belongProjectGrade;
+    }
+
+    public void setBelongProjectGrade(String belongProjectGrade) {
+        this.belongProjectGrade = belongProjectGrade;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -330,6 +358,8 @@ public class Mould extends Model<Mould> {
         ", factoryId=" + factoryId +
         ", factoryName=" + factoryName +
         ", initialModulus=" + initialModulus +
+        ", equipmentId=" + equipmentId +
+        ", belongProjectGrade=" + belongProjectGrade +
         "}";
     }
 }

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

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-07-29
+ * @since 2019-07-31
  */
 @TableName("tb_project_user")
 public class ProjectUser extends Model<ProjectUser> {
@@ -39,11 +39,23 @@ public class ProjectUser extends Model<ProjectUser> {
     private Integer userId;
 
     /**
-     * 所属方
+     * 所属公司id
      */
     @TableField("subordinate")
     private Integer subordinate;
 
+    /**
+     * 账号类型
+     */
+    @TableField("role_type")
+    private Integer roleType;
+
+    /**
+     * 所属方类型 0-资产方 1-生产方
+     */
+    @TableField("subordinate_type")
+    private Integer subordinateType;
+
 
     public Integer getId() {
         return id;
@@ -77,6 +89,22 @@ public class ProjectUser extends Model<ProjectUser> {
         this.subordinate = subordinate;
     }
 
+    public Integer getRoleType() {
+        return roleType;
+    }
+
+    public void setRoleType(Integer roleType) {
+        this.roleType = roleType;
+    }
+
+    public Integer getSubordinateType() {
+        return subordinateType;
+    }
+
+    public void setSubordinateType(Integer subordinateType) {
+        this.subordinateType = subordinateType;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -89,6 +117,8 @@ public class ProjectUser extends Model<ProjectUser> {
         ", projectId=" + projectId +
         ", userId=" + userId +
         ", subordinate=" + subordinate +
+        ", roleType=" + roleType +
+        ", subordinateType=" + subordinateType +
         "}";
     }
 }

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

@@ -156,10 +156,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         //处理users按照客户呼和供应商分组
         for (User user : users) {
             if(user.getSubordinateType()==0){
-                //供应商
+                //资产方
                 vo.getOwnerUsers().add(user);
             }else if(user.getSubordinateType()==1){
-                //客户
+                //生产方
                 vo.getCustomUsers().add(user);
             }
         }

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

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

@@ -24,11 +24,13 @@
         <result column="factory_id" property="factoryId" />
         <result column="factory_name" property="factoryName" />
         <result column="initial_modulus" property="initialModulus" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="belong_project_grade" property="belongProjectGrade" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, model_no, model_name, water_gap, tonnage, hill_number, oc_cycle, daily_output, company_id, current_version_id, state, is_delete, creator_id, project_id, rfid, setting_life, area, factory_id, factory_name, initial_modulus
+        id, model_no, model_name, water_gap, tonnage, hill_number, oc_cycle, daily_output, company_id, current_version_id, state, is_delete, creator_id, project_id, rfid, setting_life, area, factory_id, factory_name, initial_modulus, equipment_id, belong_project_grade
     </sql>
 
 </mapper>

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

@@ -8,11 +8,13 @@
         <result column="project_id" property="projectId" />
         <result column="user_id" property="userId" />
         <result column="subordinate" property="subordinate" />
+        <result column="role_type" property="roleType" />
+        <result column="subordinate_type" property="subordinateType" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, project_id, user_id, subordinate
+        id, project_id, user_id, subordinate, role_type, subordinate_type
     </sql>
 
 </mapper>

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

@@ -50,14 +50,12 @@
     <select id="selectListByCondition" resultMap="BaseResultMapVO">
         SELECT
         u.id id, u.account account, u.username username, u.password password, u.mobile mobile, u.role_type role_type, u.company_id company_id, c.`company_name` company_name,
-        r.role_name role_name,u.parent_id parent_id, u.sex sex, u.work_state work_state, u.is_disable is_disable,
+        u.role_name role_name,u.parent_id parent_id, u.sex sex, u.work_state work_state, u.is_disable is_disable,
         u.indate indate, u.head_imgurl head_imgurl, u.team_name team_name, u.subordinate_type subordinate_type
         FROM
         tb_user AS u
         LEFT JOIN tb_company c
         ON u.company_id = c.`id`
-        LEFT JOIN tb_role r
-        ON r.`id` = u.`role_type`
         <where>
             u.id != #{user.id}
             <if test="user.id != 1">
@@ -69,9 +67,6 @@
             <if test="flag==1 and keyName != '' and keyName !=null">
                 AND u.account like concat('%',#{keyName},'%')
             </if>
-            <if test="roleType != -2">
-                AND  u.role_type = #{roleType}
-            </if>
             <if test="companyId != -1">
                 AND  u.company_id = #{companyId}
             </if>