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/controller/CompanyController.java

@@ -154,7 +154,7 @@ public class CompanyController {
     }
     /**
      * 公司详情
-     * 参数 token 用户身份凭证
+     * 参数 token 用户身份凭证 companyId 公司id
      * @return
      */
     @ApiOperation(value = "公司详情")
@@ -162,7 +162,7 @@ public class CompanyController {
     @ResponseBody
     public HttpRespMsg detail(UserVO userVO){
         HttpRespMsg msg = new HttpRespMsg();
-        msg = companyService.getCoutomCompanyAndMouldsByUser(userVO);
+        msg = companyService.detail(userVO);
         return msg;
     }
 }

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

@@ -30,4 +30,7 @@ public class CompanyVO extends Company{
         private String xLat;
 
         private List<Mould> list  = new ArrayList<>();
+
+        private List<CompanyVO> relateCompanyList = new ArrayList<>();
+
 }

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/CompanyMapper.java

@@ -18,9 +18,9 @@ import java.util.List;
  */
 public interface CompanyMapper extends BaseMapper<Company> {
 
-    List<CompanyVO> getListByKeyName(@Param("keyName") String keyName, @Param("start")Integer start, @Param("pageSize") Integer pageSize, @Param("companyType")Integer companyType);
+    List<CompanyVO> getListByKeyName(@Param("keyName") String keyName, @Param("companyType")Integer companyType);
 
-    List<CompanyVO> getCustomerListByKeyName(@Param("keyName") String keyName, @Param("start")Integer start, @Param("pageSize") Integer pageSize, @Param("companyType")Integer companyType);
+    List<CompanyVO> getCustomerListByKeyName(@Param("keyName") String keyName, @Param("companyType")Integer companyType);
 
     List<CompanyVO> getListMould(@Param("mouldIds")List<Integer> mouldIds);
 }

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

@@ -33,4 +33,6 @@ public interface CompanyService extends IService<Company> {
     HttpRespMsg getCoutomCompanyAndMouldsByUser(UserVO userVO);
 
     HttpRespMsg relationList(Integer companyType);
+
+    HttpRespMsg detail(UserVO userVO);
 }

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

@@ -1,6 +1,8 @@
 package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.constant.Constant;
 import com.hssx.cloudmodel.entity.*;
 import com.hssx.cloudmodel.entity.vo.CompanyVO;
@@ -177,21 +179,14 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     public HttpRespMsg pageList(PageUtil page, String keyName, Integer companyType) {
         HttpRespMsg msg = new HttpRespMsg();
         List<CompanyVO> list = new ArrayList<>();
-        System.out.println(page);
-        Integer start = (page.getPageNum() - 1) * page.getPageSize();
+        PageHelper.startPage(page.getPageNum(),page.getPageSize());
         if (companyType == 0) {
-            list = companyMapper.getListByKeyName(keyName, start, page.getPageSize(), companyType);
-            Integer count = list.size();
-            page.setTotal(count);
-            page.setPages(page.getTotal());
+            list = companyMapper.getListByKeyName(keyName, companyType);
         } else {
-            list = companyMapper.getCustomerListByKeyName(keyName, start, page.getPageSize(), companyType);
-            Integer count = list.size();
-            page.setTotal(count);
-            page.setPages(page.getTotal());
+            list = companyMapper.getCustomerListByKeyName(keyName, companyType);
         }
-        page.setList(list);
-        msg.data = page;
+        PageInfo<CompanyVO> pageInfos = new PageInfo<>(list);
+        msg.data = pageInfos;
         return msg;
     }
 
@@ -286,6 +281,22 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         return msg;
     }
 
+    @Override
+    public HttpRespMsg detail(UserVO userVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+//        Company company = companyMapper.selectById(userVO.getCompanyId());
+//        if (company != null) {
+//            if (0 == company.getCompanyType()) {
+//                //资产方
+//                CompanyVO
+//
+//            }
+//        } else {
+//            msg.setError("公司不存在");
+//        }
+        return msg;
+    }
+
     @Override
     public HttpRespMsg deleteById(Integer id) {
         HttpRespMsg msg = new HttpRespMsg();

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

@@ -190,12 +190,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         user.setTeamName("生产方");
                     }
                     userMapper.insert(user);
-                    if (addType == 0) {
-                        Company com = new Company();
-                        com.setId(user.getCompanyId());
-                        com.setAdministrator(user.getUsername());
-                        com.setAdministratorId(user.getId());
-                        companyMapper.updateById(com);
+                    if(addType != null){
+                        if (addType == 0) {
+                            Company com = new Company();
+                            com.setId(user.getCompanyId());
+                            com.setAdministrator(user.getUsername());
+                            com.setAdministratorId(user.getId());
+                            companyMapper.updateById(com);
+                        }
                     }
                 }
             } else if (flag == 1) {

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

@@ -24,6 +24,8 @@
         <result column="company_type" property="companyType" />
         <result column="y_lng" property="yLng" />
         <result column="x_lat" property="xLat" />
+        <collection property="relateCompanyList" javaType="java.util.List" select="selectRelateCompanyList" column="{Id = id,companyType = company_type}"
+                    ofType="com.hssx.cloudmodel.entity.Company"/>
     </resultMap>
     <resultMap id="BaseResultMapMouldVO" type="com.hssx.cloudmodel.entity.vo.CompanyVO">
         <id column="id" property="id" />
@@ -50,7 +52,6 @@
                 and company_type = #{companyType}
             </if>
         </where>
-        Limit #{start},#{pageSize}
     </select>
     <select id="getCustomerListByKeyName" resultMap="BaseResultMapVO">
         select
@@ -68,7 +69,29 @@
                 and t.company_type = #{companyType}
             </if>
         </where>
-        Limit #{start},#{pageSize}
+    </select>
+    <select id="selectRelateCompanyList" resultType="com.hssx.cloudmodel.entity.vo.CompanyVO" parameterType="java.util.Map">
+      SELECT
+        t.id, t.company_name
+        from
+        tb_company t
+        left join
+        tb_asset_custom_company tbcc
+        <if test="#{companyType}==0">
+            on t.id = tbcc.custom_id
+        </if>
+        <if test="#{companyType}==1">
+            on t.id = tbcc.assert_id
+        </if>
+        <where>
+          <if test="#{companyType}==0">
+              tbcc.assert_id = #{id}
+          </if>
+          <if test="#{companyType}==1">
+              tbcc.custom_id = #{id}
+          </if>
+        </where>
+
     </select>
 
     <select id="getListMould" resultMap="BaseResultMapMouldVO">