Merge remote-tracking branch 'origin/master'

src/main/java/io/office/modules/manage/controller/TycpdmFirmChangeController.java

@@ -3,7 +3,9 @@ package io.office.modules.manage.controller;
 import java.util.Arrays;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.modules.app.annotation.Login;
+import io.office.modules.manage.entity.TycpdmFirmEntity;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -35,14 +37,26 @@ public class TycpdmFirmChangeController {
     /**
      * 列表
      */
-    @RequestMapping("/list")
+    @RequestMapping("/authApi/findlist")
    // @RequiresPermissions("manage:tycpdmfirmchange:list")
-    public R list(@RequestParam Map<String, Object> params){
-        PageUtils page = tycpdmFirmChangeService.queryPage(params);
-
-        return R.ok().put("page", page);
+        public R list(@RequestBody Map<String, Object> params){
+        Page<TycpdmFirmChangeEntity> findlist = tycpdmFirmChangeService.findlist(params,
+                new Page(Integer.valueOf(params.get("page").toString()),
+                        Integer.valueOf(params.get("limit").toString())));
+        PageUtils pageUtils = new PageUtils(findlist);
+        return R.ok().put("data", pageUtils);
     }
 
+    /**
+     * 根据用户名获取企业认证信息
+     */
+    @RequestMapping("/authApi/findUserName")
+    // @RequiresPermissions("manage:tycpdmfirm:save")
+    public R findUserName(@RequestParam("userName") String userName){
+        TycpdmFirmChangeEntity userName1 = tycpdmFirmChangeService.findUserName(userName);
+
+        return R.ok().put("data",userName1);
+    }
 
     /**
      * 信息

src/main/java/io/office/modules/manage/controller/TycpdmFirmController.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.common.exception.RRException;
 import io.office.modules.app.annotation.Login;
 import io.office.modules.manage.dao.MemberDao;
+import io.office.modules.manage.dao.TycpdmFirmDao;
 import io.office.modules.manage.entity.MemberEntity;
 import io.office.modules.manage.entity.ProductEntity;
 import io.office.modules.manage.entity.TycpdmFirmChangeEntity;
@@ -50,6 +51,8 @@ public class TycpdmFirmController extends AbstractController {
     private TycpdmFirmService tycpdmFirmService;
 
     @Autowired
+    private TycpdmFirmDao tycpdmFirmDao;
+    @Autowired
     private TycpdmFirmChangeService tycpdmFirmChangeService;
     @Autowired
     private MemberDao memberDao;
@@ -103,9 +106,10 @@ public class TycpdmFirmController extends AbstractController {
      */
     @RequestMapping("/authApi/save")
    // @RequiresPermissions("manage:tycpdmfirm:save")
-    public R save(@RequestBody Map body,@RequestParam("status")int status ) throws InvocationTargetException, IllegalAccessException {
+    public R save(@RequestBody Map body) throws InvocationTargetException, IllegalAccessException {
         TycpdmFirmEntity tycpdmFirm = new TycpdmFirmEntity();
         TycpdmFirmChangeEntity tycpdmFirmChangeEntity = new TycpdmFirmChangeEntity();
+        Integer status = body.get("status")==null?0:Integer.valueOf(String.valueOf(body.get("status")));
 
         Integer id=0;
         if (status==1){
@@ -114,6 +118,14 @@ public class TycpdmFirmController extends AbstractController {
             if (baseUser==null){
                 throw new RRException("用户名不能为空");
             }
+            String firmname = tycpdmFirm.getFirmname();
+            if (firmname==null||"".equals(tycpdmFirm)){
+                throw new RRException("企业名称不能为空");
+            }
+            int count=tycpdmFirmDao.selectByIdFirmName(firmname,1);
+            if (count>0){
+                throw new RRException("企业名称已经存在");
+            }
             //第一步不存储状态 第二部存储
             //tycpdmFirm.setLogoutFlag(0);  //审核状态 0待审核 1审核成功 2审核失败
             tycpdmFirmService.save(tycpdmFirm);

src/main/java/io/office/modules/manage/dao/TycpdmFirmChangeDao.java

 package io.office.modules.manage.dao;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.modules.manage.entity.TycpdmFirmChangeEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.office.modules.manage.entity.TycpdmFirmEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.springframework.data.repository.query.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * ${comments}
  * 
@@ -20,4 +26,12 @@ public interface TycpdmFirmChangeDao extends BaseMapper<TycpdmFirmChangeEntity>
 
     @Update("UPDATE tycpdm_firm_change SET logout_flag = #{logout_flag} WHERE id = #{id}")
     void updateBYIdLogoutFlag(@Param("logout_flag") String logout_flag, @Param("id") String id);
+
+    Integer findTycpdmFirmLogoutFlagCountALL(@Param("levels")Integer levels,@Param("logout_flag")Integer logout_flag);
+
+    List<TycpdmFirmChangeEntity> selectTycpdmFirmList(Map<String, Object> params, Page page);
+
+    @Select("select * from tycpdm_firm_change where base_user=#{userName}")
+    TycpdmFirmChangeEntity findUserName(@Param("userName") String userName);
+
 }

src/main/java/io/office/modules/manage/dao/TycpdmFirmDao.java

@@ -35,4 +35,7 @@ public interface TycpdmFirmDao extends BaseMapper<TycpdmFirmEntity> {
 
     @Update("UPDATE tycpdm_firm SET logout_flag = #{logout_flag} WHERE f_id = #{id}")
     void updateBYIdLogoutFlag(@Param("logout_flag") String logout_flag, @Param("id") String id);
+
+    @Select("select count(1) from tycpdm_firm where firmName=#{firmname} and logout_flag=#{logout_flag}")
+    int selectByIdFirmName(@Param("firmname")String firmname, @Param("logout_flag")int logout_flag);
 }

src/main/java/io/office/modules/manage/service/TycpdmFirmChangeService.java

 package io.office.modules.manage.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import io.office.common.utils.PageUtils;
 import io.office.modules.manage.entity.TycpdmFirmChangeEntity;
+import io.office.modules.manage.entity.TycpdmFirmEntity;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Map;
@@ -19,5 +21,9 @@ public interface TycpdmFirmChangeService extends IService<TycpdmFirmChangeEntity
     PageUtils queryPage(Map<String, Object> params);
 
     void uploadFile(MultipartFile file, Integer id);
+
+    Page<TycpdmFirmChangeEntity> findlist(Map<String, Object> params, Page page);
+
+    TycpdmFirmChangeEntity findUserName(String userName);
 }
 

src/main/java/io/office/modules/manage/service/impl/TycpdmFirmChangeServiceImpl.java

 package io.office.modules.manage.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.office.common.exception.RRException;
+import io.office.modules.manage.entity.TycpdmFirmEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -84,4 +87,16 @@ public class TycpdmFirmChangeServiceImpl extends ServiceImpl<TycpdmFirmChangeDao
         }
     }
 
+    @Override
+    public Page<TycpdmFirmChangeEntity> findlist(Map<String, Object> params, Page page) {
+        List<TycpdmFirmChangeEntity> list = tycpdmFirmChangeDao.selectTycpdmFirmList(params,page);
+        page.setRecords(list);
+        return page;
+    }
+
+    @Override
+    public TycpdmFirmChangeEntity findUserName(String userName) {
+        return tycpdmFirmChangeDao.findUserName(userName);
+    }
+
 }
\ No newline at end of file

src/main/java/io/office/modules/manage/service/impl/TycpdmFirmServiceImpl.java

@@ -89,6 +89,7 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm
             throw new RRException("无权访问");
         }
         //审核状态 0待审核   1审核成功   2审核失败
+        //查询审核数据
         Integer countAll=tycpdmFirmDao.findTycpdmFirmLogoutFlagCountALL(levels,null);//查询 申请总数
         Integer auditCount=tycpdmFirmDao.findTycpdmFirmLogoutFlagCountALL(levels,0);//查询  等待审核  0
         Integer throughCount=tycpdmFirmDao.findTycpdmFirmLogoutFlagCountALL(levels,1);//查询 通过审核  1
@@ -97,6 +98,15 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm
         map.put("auditCount",auditCount);
         map.put("throughCount",throughCount);
         map.put("notThroughCount",notThroughCount);
+        //查询变更数据
+        Integer countChangeAll=tycpdmFirmChangeDao.findTycpdmFirmLogoutFlagCountALL(levels,null);//查询 申请总数
+        Integer auditChangeCount=tycpdmFirmChangeDao.findTycpdmFirmLogoutFlagCountALL(levels,0);//查询  等待审核  0
+        Integer throughChangeCount=tycpdmFirmChangeDao.findTycpdmFirmLogoutFlagCountALL(levels,1);//查询 通过审核  1
+        Integer notThroughChangeCount=tycpdmFirmChangeDao.findTycpdmFirmLogoutFlagCountALL(levels,2);//查询 未通过审核  2
+        map.put("countChangeAll",countChangeAll);
+        map.put("auditChangeCount",auditChangeCount);
+        map.put("throughChangeCount",throughChangeCount);
+        map.put("notThroughChangeCount",notThroughChangeCount);
         return map;
     }
 

src/main/resources/mapper/manage/TycpdmFirmChangeDao.xml

@@ -55,4 +55,32 @@
     </resultMap>
 
 
+    <select id="findTycpdmFirmLogoutFlagCountALL"  parameterType="java.lang.Integer" resultType="java.lang.Integer">
+        select count(*) from tycpdm_firm_change  a left join tycpdm_user_service b   on a.f_id=b.f_id
+        where 1=1
+        <if test="levels ==-99">
+            and branchcode=#{levels}
+        </if>
+        <if test="logout_flag !=null">
+            and logout_flag=#{logout_flag}
+        </if>
+        and  logout_flag &lt;&gt;-1;
+
+    </select>
+
+
+    <select id="selectTycpdmFirmList" resultMap="tycpdmFirmChangeMap" parameterType="java.util.Map">
+        select * from tycpdm_firm_change where 1=1
+        <if test="params.firmName !='' and params.firmName !=null">
+            and firmName like concat('%',#{params.firmName},'%')
+        </if>
+        <if test="params.logout_flag !='' and params.logout_flag !=null">
+            and logout_flag =#{params.logout_flag}
+        </if>
+        <if test="params.branchCode !='' and params.branchCode !=null">
+            and branchCode =#{params.branchCode}
+        </if>
+
+    </select>
+
 </mapper>
\ No newline at end of file