haungfuli 3 年之前
父節點
當前提交
fc27a33486
共有 17 個文件被更改,包括 505 次插入29 次删除
  1. 5 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java
  2. 19 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CompanyInfoController.java
  3. 36 7
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PatformAnagementEgulationsController.java
  4. 4 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CargoOwnerInfo.java
  5. 20 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CompanyInfo.java
  6. 11 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/OrderInfo.java
  7. 29 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PatformAnagementEgulations.java
  8. 16 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CompanyInfoMapper.java
  9. 19 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/PatformAnagementEgulationsMapper.java
  10. 15 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICompanyInfoService.java
  11. 37 2
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IPatformAnagementEgulationsService.java
  12. 21 4
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/AgentCargoOwnerInfoServiceImpl.java
  13. 1 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerInfoServiceImpl.java
  14. 56 1
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CompanyInfoServiceImpl.java
  15. 83 15
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PatformAnagementEgulationsServiceImpl.java
  16. 72 0
      winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/CompanyInfoMapper.xml
  17. 61 0
      winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/PatformAnagementEgulationsMapper.xml

+ 5 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -197,6 +197,11 @@ public enum StatusEnum {
     PLATFORM_CERTIFIED("9", "已认证", "platform_certified"),
     CAUTHORIZATION_REVOKED("17", "授权已撤销", "authorization_revoked"),
 
+    //平台规定管理状态
+    PLATFORM_REVIEWED("1", "待审核", "reviewed"),
+    PLATFORM_FAILED("3", "已驳回", "passed"),
+    PLATFORM_COMPLETED("5", "生效中", "Completed"),
+
     ;
     @Getter
     private String flag;

+ 19 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CompanyInfoController.java

@@ -74,5 +74,24 @@ public class CompanyInfoController {
     public Page<CompanyInfo> selectAllCompany(CompanyInfo companyInfo){
         return companyInfoService.selectAllCompany(companyInfo);
     }
+
+    /**
+     * 企业审核后台管理列表
+     * @return
+     */
+    @GetMapping("/selectCompanyPage")
+    public Page<CompanyInfo> selectCompanyPage(CompanyInfo companyInfo){
+        return companyInfoService.selectCompanyPage(companyInfo);
+    }
+
+    /**
+     * 审核
+     * @param
+     * @return
+     */
+    @PostMapping("/api/examine")
+    public String examine(CompanyInfo companyInfo){
+        return companyInfoService.examine(companyInfo);
+    }
 }
 

+ 36 - 7
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PatformAnagementEgulationsController.java

@@ -1,6 +1,8 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PatformAnagementEgulations;
 import com.yh.saas.plugin.yiliangyiyun.service.IOrderInfoService;
@@ -25,32 +27,59 @@ public class PatformAnagementEgulationsController {
     private IPatformAnagementEgulationsService patformAnagementEgulationsService;
 
     /**
-     * 详情
+     * 查看
      */
     @GetMapping("/show")
-    public PatformAnagementEgulations show() {
-        return patformAnagementEgulationsService.show();
+    public PatformAnagementEgulations show(String id) {
+        return patformAnagementEgulationsService.show(id);
     }
 
-
-
     /**
      * 新增
      * @param patformAnagementEgulations
      * @return
      */
     @PostMapping("/api/add")
-    public String add(@RequestBody PatformAnagementEgulations patformAnagementEgulations){
+    public String add( PatformAnagementEgulations patformAnagementEgulations){
         return patformAnagementEgulationsService.add(patformAnagementEgulations);
     }
+
     /**
      * 编辑
      * @param patformAnagementEgulations
      * @return
      */
     @PostMapping("/api/edit")
-    public String edit(@RequestBody PatformAnagementEgulations patformAnagementEgulations){
+    public String edit( PatformAnagementEgulations patformAnagementEgulations){
         return patformAnagementEgulationsService.edit(patformAnagementEgulations);
     }
+
+    /**
+     * 删除
+     * @param patformAnagementEgulations
+     */
+    @PostMapping("/api/delete")
+    public void delete( PatformAnagementEgulations patformAnagementEgulations){
+        patformAnagementEgulationsService.delete(patformAnagementEgulations.getId());
+    }
+
+    /**
+     * 平台规定管理列表
+     * @return
+     */
+    @GetMapping("/selectPage")
+    public Page<PatformAnagementEgulations> selectPage(PatformAnagementEgulations patformAnagementEgulations){
+        return patformAnagementEgulationsService.selectPage(patformAnagementEgulations);
+    }
+
+    /**
+     * 审核
+     * @param
+     * @return
+     */
+    @PostMapping("/api/examine")
+    public String examine(PatformAnagementEgulations patformAnagementEgulations){
+        return patformAnagementEgulationsService.examine(patformAnagementEgulations);
+    }
 }
 

+ 4 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CargoOwnerInfo.java

@@ -81,6 +81,10 @@ public class CargoOwnerInfo extends BaseModel<CargoOwnerInfo> {
      * 驳回原因描述
      */
     private String rejectReasonDescription;
+    /**
+     * 第一次认证标识
+     */
+    private String firstFlag;
 
     @TableField(exist = false)
     private List<CargoOwnerCompInfo> cargoOwnerCompInfoList;

+ 20 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CompanyInfo.java

@@ -120,11 +120,31 @@ public class CompanyInfo extends BaseModel<CompanyInfo> {
      */
     private String rejectReasonDescription;
 
+    /**
+     * 审核标识
+     */
+    @TableField(exist = false)
+    private String flag;
     /**
      * 模糊查询
      */
     @TableField(exist = false)
     private String searchKeyWord;
+    /**
+     * 查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
+    /**
+     * 账号
+     */
+    @TableField(exist = false)
+    private String accountNumber;
+    /**
+     * 头像
+     */
+    @TableField(exist = false)
+    private String avatarUrl;
 
 
     @Override

+ 11 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/OrderInfo.java

@@ -163,6 +163,17 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      */
     private String rejectReasonDescription;
 
+    /**
+     * 开始时间
+     */
+    @TableField(exist = false)
+    private String startDate;
+
+    /**
+     * 结束时间
+     */
+    @TableField(exist = false)
+    private String endDate;
 
     /**
      * 模糊查询

+ 29 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PatformAnagementEgulations.java

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
@@ -39,6 +40,10 @@ public class PatformAnagementEgulations extends BaseModel<PatformAnagementEgulat
      * 编纂人员
      */
     private String editor;
+    /**
+     * 提交人
+     */
+    private String submitter;
     /**
      * 版本号
      */
@@ -51,6 +56,30 @@ public class PatformAnagementEgulations extends BaseModel<PatformAnagementEgulat
      * 内容
      */
     private String content;
+    /**
+     * 状态key(1待审核3已驳回5生效中7已失效)
+     */
+    private String statusKey;
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 审核标识
+     */
+    @TableField(exist = false)
+    private String flag;
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+    /**
+     * 查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
 
 
     @Override

+ 16 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CompanyInfoMapper.java

@@ -32,4 +32,20 @@ public interface CompanyInfoMapper extends BaseMapper<CompanyInfo> {
      * @return
      */
     List<CompanyInfo> getListByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询公司总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByConditions(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询公司列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<CompanyInfo> getListByConditions(Map<String, Object> pageView);
 }

+ 19 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/PatformAnagementEgulationsMapper.java

@@ -1,8 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PatformAnagementEgulations;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 记录平台管理规定 Mapper 接口
@@ -13,4 +17,19 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  */
 public interface PatformAnagementEgulationsMapper extends BaseMapper<PatformAnagementEgulations> {
 
+    /**
+     * 根据条件查询规定总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByConditions(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询规定列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<PatformAnagementEgulations> getListByConditions(Map<String, Object> pageView);
 }

+ 15 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICompanyInfoService.java

@@ -58,4 +58,19 @@ public interface ICompanyInfoService extends IService<CompanyInfo> {
      * @return
      */
     Page<CompanyInfo> selectAllCompany(CompanyInfo companyInfo);
+
+    /**
+     * 企业审核后台管理列表
+     *
+     * @param
+     * @return
+     */
+    Page<CompanyInfo> selectCompanyPage(CompanyInfo companyInfo);
+
+    /**
+     * 审核
+     * @param companyInfo
+     * @return
+     */
+    String examine(CompanyInfo companyInfo);
 }

+ 37 - 2
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IPatformAnagementEgulationsService.java

@@ -1,5 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.PatformAnagementEgulations;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -14,10 +15,44 @@ import com.baomidou.mybatisplus.service.IService;
 public interface IPatformAnagementEgulationsService extends IService<PatformAnagementEgulations> {
 
 
-
+    /**
+     * 新增
+     * @param patformAnagementEgulations
+     * @return
+     */
     String add(PatformAnagementEgulations patformAnagementEgulations);
 
+    /**
+     * 编辑
+     * @param patformAnagementEgulations
+     * @return
+     */
     String edit(PatformAnagementEgulations patformAnagementEgulations);
 
-    PatformAnagementEgulations show();
+    /**
+     * 查看
+     * @param id
+     * @return
+     */
+    PatformAnagementEgulations show(String id);
+
+    /**
+     * 删除
+     * @param id
+     */
+    void delete(String id);
+
+    /**
+     * 平台规定管理列表
+     * @param
+     * @return
+     */
+    Page<PatformAnagementEgulations> selectPage(PatformAnagementEgulations patformAnagementEgulations);
+
+    /**
+     * 审核
+     * @param patformAnagementEgulations
+     * @return
+     */
+    String examine(PatformAnagementEgulations patformAnagementEgulations);
 }

+ 21 - 4
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/AgentCargoOwnerInfoServiceImpl.java

@@ -3,17 +3,15 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
-import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.AgentCargoOwnerInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IAgentCargoOwnerInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerCompInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +28,10 @@ import java.util.Map;
 @Service
 public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerInfoMapper, AgentCargoOwnerInfo> implements IAgentCargoOwnerInfoService {
 
+    @Autowired
+    private ICargoOwnerCompInfoService cargoOwnerCompInfoService;
+
+
     /**
      *代理货主列表
      * @param agentCargoOwnerInfo
@@ -62,6 +64,10 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
     public String editAgentCargoOwner(AgentCargoOwnerInfo agentCargoOwnerInfo) {
         //查询代理货主信息
         AgentCargoOwnerInfo agentCargoOwnerInfo1 = this.selectById(agentCargoOwnerInfo.getId());
+        //查询所属公司
+        CargoOwnerCompInfo cargoOwnerCompInfo = cargoOwnerCompInfoService.selectOne(new EntityWrapper<CargoOwnerCompInfo>()
+            .eq("common_id",agentCargoOwnerInfo1.getAgentCommonId())
+            .eq("delete_flag","0"));
         //如果信息不为空,授权
         if (agentCargoOwnerInfo1 != null){
             if("1".equals(agentCargoOwnerInfo.getGrantFlag())){
@@ -72,12 +78,23 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
                 //信息编辑,驳回
                 agentCargoOwnerInfo1.setStatus(StatusEnum.TASK_RETURN.getName());
                 agentCargoOwnerInfo1.setStatusKey(StatusEnum.TASK_RETURN.getFlag());
+                if (cargoOwnerCompInfo != null){
+                    //更改所属公司状态
+                    cargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_REJECTED.getName());
+                    cargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_REJECTED.getFlag());
+                }
             }else {
                 //信息编辑,撤销授权
                 agentCargoOwnerInfo1.setStatus(StatusEnum.AUTHORIZATION_REVOKED.getName());
                 agentCargoOwnerInfo1.setStatusKey(StatusEnum.AUTHORIZATION_REVOKED.getFlag());
+                if (cargoOwnerCompInfo != null) {
+                    //更改所属公司状态
+                    cargoOwnerCompInfo.setStatus(StatusEnum.CAUTHORIZATION_REVOKED.getName());
+                    cargoOwnerCompInfo.setStatusKey(StatusEnum.CAUTHORIZATION_REVOKED.getFlag());
+                }
             }
             this.updateById(agentCargoOwnerInfo1);
+            cargoOwnerCompInfoService.updateById(cargoOwnerCompInfo);
         }
         return "OK";
     }

+ 1 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerInfoServiceImpl.java

@@ -146,6 +146,7 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
             if ("1".equals(cargoOwnerInfo.getFlag())) {
                 cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
                 cargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                cargoOwnerInfo1.setFirstFlag("1");
 //                geTuiUtils.pushByCid("审核通知", "您的司机认证申请已审核通过", commonUser.getId());
 //                UnimallMessage messageDO = new UnimallMessage();
 //                messageDO.setAdminId(commonUser.getId());

+ 56 - 1
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CompanyInfoServiceImpl.java

@@ -7,7 +7,6 @@ import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CompanyInfoMapper;
@@ -131,4 +130,60 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, Compa
         page.setTotal(dataCount == null ? 0 : dataCount);
         return page;
     }
+
+    /**
+     *企业审核后台管理列表
+     * @param
+     * @return
+     */
+    @Override
+    public Page<CompanyInfo> selectCompanyPage(CompanyInfo companyInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (companyInfo.getCurrentPage() - 1)
+                * companyInfo.getPageSize());
+        //模糊查询
+        pageView.put("searchKeyWord", companyInfo.getSearchKeyWord());
+        pageView.put("searchType", companyInfo.getSearchType());
+        pageView.put("pageSize", companyInfo.getPageSize());
+        pageView.put("currentPage", companyInfo.getCurrentPage());
+        // 查询公司总数
+        Integer dataCount = baseMapper.getCountByConditions(pageView);
+        List<CompanyInfo> dataList = baseMapper.getListByConditions(pageView);
+        Page<CompanyInfo> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(companyInfo.getCurrentPage());
+        page.setSize(companyInfo.getPageSize());
+        return page;
+    }
+
+    /**
+     * 审核/ 禁用
+     *
+     * @param companyInfo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String examine(CompanyInfo companyInfo) {
+        //查询列表
+        CompanyInfo companyInfo1 = this.selectById(companyInfo.getId());
+
+        if (companyInfo1 != null) {
+            //通过
+            if ("1".equals(companyInfo.getFlag())) {
+                companyInfo1.setStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                companyInfo1.setStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+            }
+            //驳回
+            else if("2".equals(companyInfo.getFlag())){
+                companyInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                companyInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
+            }
+            //更改信息
+            this.updateById(companyInfo1);
+            return "OK";
+        }
+        return "NG";
+    }
 }

+ 83 - 15
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PatformAnagementEgulationsServiceImpl.java

@@ -1,12 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
-import com.yh.saas.plugin.yiliangyiyun.entity.PatformAnagementEgulations;
-import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.PatformAnagementEgulationsMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IPatformAnagementEgulationsService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -15,7 +14,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,7 +40,8 @@ public class PatformAnagementEgulationsServiceImpl extends ServiceImpl<PatformAn
     public String add(PatformAnagementEgulations patformAnagementEgulations) {
         //新增主键id
         patformAnagementEgulations.setId(IdGenerator.generateUUID());
-
+        patformAnagementEgulations.setStatusKey(StatusEnum.PLATFORM_REVIEWED.getFlag());
+        patformAnagementEgulations.setStatus(StatusEnum.PLATFORM_REVIEWED.getName());
         // 操作主表数据
         boolean one = this.insert(patformAnagementEgulations);
         if (one) {
@@ -56,13 +58,14 @@ public class PatformAnagementEgulationsServiceImpl extends ServiceImpl<PatformAn
      */
     @Override
     public String edit(PatformAnagementEgulations patformAnagementEgulations) {
-        //查询发布任务
-        PatformAnagementEgulations patformAnagementEgulations1 = this.selectById(patformAnagementEgulations.getId());
-        //除审核中状态其余可编辑
-        if(patformAnagementEgulations1 != null) {
-            this.updateById(patformAnagementEgulations1);
+        patformAnagementEgulations.setStatusKey(StatusEnum.PLATFORM_REVIEWED.getFlag());
+        patformAnagementEgulations.setStatus(StatusEnum.PLATFORM_REVIEWED.getName());
+        boolean one = this.updateById(patformAnagementEgulations);
+        if(one){
+            return "OK";
+        }{
+            return "NG";
         }
-        return "OK";
     }
 
 
@@ -71,12 +74,77 @@ public class PatformAnagementEgulationsServiceImpl extends ServiceImpl<PatformAn
      * @return
      */
     @Override
-    public PatformAnagementEgulations show() {
-        //查询发布任务
-        PatformAnagementEgulations patformAnagementEgulations = this.selectOne(new EntityWrapper<PatformAnagementEgulations>().eq("delete_flag","0"));
-        //查询货主姓名
+    public PatformAnagementEgulations show(String id) {
+        PatformAnagementEgulations patformAnagementEgulations = this.selectById(id);
         return patformAnagementEgulations;
     }
 
+    /**
+     * 删除
+     * @param id
+     */
+    @Override
+    public void delete(String id) {
+        PatformAnagementEgulations patformAnagementEgulations = this.selectById(id);
+        if (patformAnagementEgulations != null) {
+            this.deleteById(patformAnagementEgulations.getId());
+        }
+    }
+
+    /**
+     *平台规定管理列表
+     * @param
+     * @return
+     */
+    @Override
+    public Page<PatformAnagementEgulations> selectPage(PatformAnagementEgulations patformAnagementEgulations) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (patformAnagementEgulations.getCurrentPage() - 1)
+                * patformAnagementEgulations.getPageSize());
+        //模糊查询
+        pageView.put("searchKeyWord", patformAnagementEgulations.getSearchKeyWord());
+        pageView.put("searchType", patformAnagementEgulations.getSearchType());
+        pageView.put("pageSize", patformAnagementEgulations.getPageSize());
+        pageView.put("currentPage", patformAnagementEgulations.getCurrentPage());
+        // 查询规定总数
+        Integer dataCount = baseMapper.getCountByConditions(pageView);
+        List<PatformAnagementEgulations> dataList = baseMapper.getListByConditions(pageView);
+        Page<PatformAnagementEgulations> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(patformAnagementEgulations.getCurrentPage());
+        page.setSize(patformAnagementEgulations.getPageSize());
+        return page;
+    }
+
+    /**
+     * 审核
+     *
+     * @param patformAnagementEgulations
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String examine(PatformAnagementEgulations patformAnagementEgulations) {
+        //查询
+        PatformAnagementEgulations patformAnagementEgulations1 = this.selectById(patformAnagementEgulations.getId());
+
+        if (patformAnagementEgulations1 != null) {
+            //通过
+            if ("1".equals(patformAnagementEgulations.getFlag())) {
+                patformAnagementEgulations1.setStatusKey(StatusEnum.PLATFORM_COMPLETED.getFlag());
+                patformAnagementEgulations1.setStatus(StatusEnum.PLATFORM_COMPLETED.getName());
+            }
+            //驳回
+            else if("2".equals(patformAnagementEgulations.getFlag())){
+                patformAnagementEgulations1.setStatusKey(StatusEnum.PLATFORM_FAILED.getFlag());
+                patformAnagementEgulations1.setStatus(StatusEnum.PLATFORM_FAILED.getName());
+            }
+            //更改信息
+            this.updateById(patformAnagementEgulations1);
+            return "OK";
+        }
+        return "NG";
+    }
 
 }

+ 72 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/CompanyInfoMapper.xml

@@ -28,4 +28,76 @@
         </if>
         ORDER BY create_date DESC
     </select>
+
+
+    <!-- 获得公司总数后台管理 -->
+    <select id="getCountByConditions" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(c.id)
+        FROM company_info c
+        LEFT JOIN common_user cu on cu.id = c.common_id and cu.delete_flag = 0
+        WHERE c.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND c.status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND c.status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND c.status_key = '5'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(c.legal_person_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.company_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(cu.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+    </select>
+    <!-- 获得公司列表后台管理 -->
+    <select id="getListByConditions" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo">
+        SELECT
+        c.id,
+        c.company_name as companyName,
+        c.unified_social_credit_code as unifiedSocialCreditCode,
+        c.legal_person_name as legalPersonName,
+        c.phone,
+        c.registered_paid_amount as registeredPaidAmount,
+        c.land_ownership as landOwnership,
+        c.site_lease_date as siteLeaseDate,
+        c.business_term_date as businessTermDate,
+        c.business_license_address_url as businessLicenseAddressUrl,
+        c.property_address_url as propertyAddressUrl,
+        c.advance_freight_service as advanceFreightService,
+        c.status_key as statusKey,
+        c.status,
+        c.create_date as createDate,
+        c.update_date as updateDate,
+        cu.phone as accountNumber,
+        cu.avatar_url as avatarUrl
+        FROM company_info c
+        LEFT JOIN common_user cu on cu.id = c.common_id and cu.delete_flag = 0
+        WHERE c.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND c.status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND c.status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND c.status_key = '5'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(c.legal_person_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(c.company_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(cu.phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        ORDER BY c.create_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>

+ 61 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/PatformAnagementEgulationsMapper.xml

@@ -2,4 +2,65 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.PatformAnagementEgulationsMapper">
 
+    <!-- 获得规定总数后台管理 -->
+    <select id="getCountByConditions" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(id)
+        FROM patform_anagement_egulations
+        WHERE delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND status_key = '5'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(version_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(compilation_unit) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(editor) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+    </select>
+    <!-- 获得规定列表后台管理 -->
+    <select id="getListByConditions" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.PatformAnagementEgulations">
+        SELECT
+        id,
+        compilation_unit as compilationUnit,
+        editor,
+        submitter,
+        version_number as versionNumber,
+        version_description as versionDescription,
+        content,
+        status_key as statusKey,
+        status,
+        create_date as createDate,
+        update_date as updateDate
+        FROM patform_anagement_egulations
+        WHERE delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND status_key = '5'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(version_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(compilation_unit) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(editor) like lower(CONCAT('%',#{searchKeyWord},'%')))
+        </if>
+        ORDER BY create_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>