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/Company.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-08-01
+ * @since 2019-08-16
  */
 @TableName("tb_company")
 public class Company extends Model<Company> {
@@ -44,6 +44,18 @@ public class Company extends Model<Company> {
     @TableField("company_type")
     private Integer companyType;
 
+    /**
+     * 管理员id
+     */
+    @TableField("administrator_id")
+    private Integer administratorId;
+
+    /**
+     * 管理员姓名
+     */
+    @TableField("administrator")
+    private String administrator;
+
 
     public Integer getId() {
         return id;
@@ -77,6 +89,22 @@ public class Company extends Model<Company> {
         this.companyType = companyType;
     }
 
+    public Integer getAdministratorId() {
+        return administratorId;
+    }
+
+    public void setAdministratorId(Integer administratorId) {
+        this.administratorId = administratorId;
+    }
+
+    public String getAdministrator() {
+        return administrator;
+    }
+
+    public void setAdministrator(String administrator) {
+        this.administrator = administrator;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -89,6 +117,8 @@ public class Company extends Model<Company> {
         ", companyName=" + companyName +
         ", companyAddress=" + companyAddress +
         ", companyType=" + companyType +
+        ", administratorId=" + administratorId +
+        ", administrator=" + administrator +
         "}";
     }
 }

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

@@ -268,11 +268,30 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             map.put("view", 1);
             map.put("approve", approve);
         }else if(projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId())) > 0){
-                //是否为审批人
-                map.put("update", 0);
-                map.put("download", 1);
-                map.put("view", 1);
-                map.put("approve", 1);
+            //是否为审批人
+            //该项目的参与人
+            Integer update = 0;
+            Integer download = 0;
+            Integer view = 0;
+            Integer approve = 1;
+            List<Power> powers = powerMapper.selectList(new QueryWrapper<Power>().eq("project_id", project.getId()).eq("user_id", currentUser.getId()));
+            if (powers.size() > 0) {
+                for (Power power : powers) {
+                    if (power.getPowerType() == 0) {
+                        update = 1;
+                    } else if (power.getPowerType() == 1) {
+                        download = 1;
+                    } else if (power.getPowerType() == 2) {
+                        view = 1;
+                    } else {
+                        approve = 1;
+                    }
+                }
+            }
+            map.put("update", update);
+            map.put("download", download);
+            map.put("view", view);
+            map.put("approve", approve);
         } else {
             //该项目的参与人
             Integer update = 0;

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

cloud-model/src/main/resources/application.properties

@@ -42,8 +42,8 @@ download.path=D:/mould/download/
 #######################################################################################################
 # 配置上传文件的大小设置
 # Single file max size  即单个文件大小
-spring.servlet.multipart.max-file-size=1000MB
-spring.servlet.multipart.max-request-size=1000MB
+spring.servlet.multipart.max-file-size=10000MB
+spring.servlet.multipart.max-request-size=10000MB
 ##################SpringBoot连接池配置########
 spring.datasource.hikari.minimum-idle=3
 spring.datasource.hikari.maximum-pool-size=10

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

@@ -8,7 +8,15 @@
         <result column="company_name" property="companyName" />
         <result column="company_address" property="companyAddress" />
         <result column="company_type" property="companyType" />
+        <result column="administrator_id" property="administratorId" />
+        <result column="administrator" property="administrator" />
     </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, company_name, company_address, company_type, administrator_id, administrator
+    </sql>
+
     <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.CompanyVO">
         <id column="id" property="id" />
         <result column="company_name" property="companyName" />
@@ -28,10 +36,6 @@
                     ofType="com.hssx.cloudmodel.entity.Mould"/>
     </resultMap>
 
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_name, company_address, company_type
-    </sql>
 
     <select id="getListByKeyName" resultMap="BaseResultMapVO">
         select
@@ -40,7 +44,7 @@
         tb_company
         <where>
             <if test="keyName != null and keyName != ''">
-               and company_name like concat('%',#{keyName},'%')
+                and company_name like concat('%',#{keyName},'%')
             </if>
             <if test="companyType != null">
                 and company_type = #{companyType}
@@ -58,7 +62,7 @@
         on tc.company_id = t.id
         <where>
             <if test="keyName != null and keyName != ''">
-               and t.company_name like concat('%',#{keyName},'%')
+                and t.company_name like concat('%',#{keyName},'%')
             </if>
             <if test="companyType != null">
                 and t.company_type = #{companyType}
@@ -68,18 +72,18 @@
     </select>
 
     <select id="getListMould" resultMap="BaseResultMapMouldVO">
-       select
+        select
         t.id, t.company_name, t.company_address, t.company_type,tbc.y_lng, tbc.x_lat
         from
-          tb_mould tm
+        tb_mould tm
         LEFT JOIN
-          tb_company t
+        tb_company t
         on
-          tm.produce_company_id = t.id
+        tm.produce_company_id = t.id
         LEFT JOIN
-          tb_lng_lat_company tbc
+        tb_lng_lat_company tbc
         ON
-          tbc.company_id = t.id
+        tbc.company_id = t.id
         where  t.id IS NOT NULL AND tm.id in
         <foreach item="item" index="index" collection="mouldIds"
                  open="(" separator="," close=")">

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

@@ -98,6 +98,8 @@
             <id column="model_id" property="id" />
             <result column="model_no" property="modelNo" />
             <result column="model_name" property="modelName" />
+            <result column="produce_company_id" property="produceCompanyId" />
+            <result column="produce_company_name" property="factoryName" />
         </collection>
         <collection property="approves" ofType="com.hssx.cloudmodel.entity.ProjectApprove">
             <result column="approver_id" property="approverId" />
@@ -118,7 +120,7 @@
         p.id id, p.project_name project_name, p.project_no project_no, p.creator_id creator_id,p.manager_id manager_id,p.manager manager,
         p.creator creator, p.owner_company owner_company,p.owner_company_name owner_company_name,p.indate pindate,
         m.id model_id, m.model_no model_no,m.model_name model_name,a.approver_id approver_id,a.approver_name approver_name,a.subordinate_type subordinate_type,
-        c.company_id companyid,c.company_name companyname
+        c.company_id companyid,c.company_name companyname,tbc.company_name produce_company_name,tbc.id produce_company_id
     from
         tb_project p
     left join tb_mould m
@@ -127,6 +129,8 @@
     on p.id = a.project_id
     left join tb_custom_company c
     on c.project_id = p.id
+    LEFT JOIN tb_company tbc
+    ON tbc.`id` = m.`produce_company_id`
     where
       p.id = #{id}
     </select>