更新

pom.xml

@@ -184,9 +184,6 @@
             <properties>
                 <env>local</env>
             </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
         <profile>
             <id>dev</id>
@@ -206,6 +203,9 @@
                 <env>prod</env>
             </properties>
 
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
     </profiles>
     <build>

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonCompanyIdentityController.java

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 公司、粮商身份关系表 前端控制器
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-09-02
+ */
+@RestController
+@RequestMapping("/commonCompanyIdentity")
+public class CommonCompanyIdentityController {
+
+}
+

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CommonCompanyIdentity.java

@@ -3,8 +3,10 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.Version;
 
+import com.baomidou.mybatisplus.enums.IdType;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -28,6 +30,8 @@ public class CommonCompanyIdentity extends BaseModel<CommonCompanyIdentity> {
     /**
      * 公司id
      */
+
+    @TableId(type = IdType.UUID)
     private String comId;
     /**
      * 身份认证表id

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PurchasePrice.java

@@ -6,8 +6,10 @@ import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.Version;
 
+import com.baomidou.mybatisplus.enums.IdType;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
@@ -38,6 +40,7 @@ public class PurchasePrice extends BaseModel<PurchasePrice> {
     /**
      * 主键
      */
+    @TableId(type = IdType.UUID)
     private String id;
     /**
      * 仓库id

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PurchasePriceDetail.java

@@ -3,8 +3,10 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.Version;
 
+import com.baomidou.mybatisplus.enums.IdType;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -28,6 +30,7 @@ public class PurchasePriceDetail extends BaseModel<PurchasePriceDetail> {
     /**
      * 主键
      */
+    @TableId(type = IdType.UUID)
     private String id;
     /**
      * 主表id

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PurchasePriceDetailPrint.java

@@ -3,8 +3,10 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.Version;
 
+import com.baomidou.mybatisplus.enums.IdType;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -28,6 +30,7 @@ public class PurchasePriceDetailPrint extends BaseModel<PurchasePriceDetailPrint
     /**
      * 主键
      */
+    @TableId(type = IdType.UUID)
     private String id;
     /**
      * 主表id

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonCompanyIdentityServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.CommonCompanyIdentity;
+import com.yh.saas.plugin.yiliangyiyun.mapper.CommonCompanyIdentityMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ICommonCompanyIdentityService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 公司、粮商身份关系表 服务实现类
+ * </p>
+ *
+ * @author Gongdc
+ * @since 2021-09-02
+ */
+@Service
+public class CommonCompanyIdentityServiceImpl extends ServiceImpl<CommonCompanyIdentityMapper, CommonCompanyIdentity> implements ICommonCompanyIdentityService {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/IdentityAuthenticationInfoServiceImpl.java

@@ -43,7 +43,7 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
     @Autowired
     private ICommonBillOperateHisService billOperateHisService;
     @Autowired
-    private CommonCompanyIdentityMapper commonCompanyIdentityMapper;
+    private ICommonCompanyIdentityService iCommonCompanyIdentityService;
 
     /**
      * 粮商认证列表
@@ -405,9 +405,9 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
         commonCompanyIdentity.setIdentityId(identityAuthenticationInfo.getId());
         commonCompanyIdentity.setComId(identityAuthenticationInfo.getCompId());
 
-        Integer one = this.commonCompanyIdentityMapper.insert(commonCompanyIdentity);
+        Boolean one = iCommonCompanyIdentityService.insert(commonCompanyIdentity);
         //成功返回ok
-        if (one > 0) {
+        if (one ) {
             return "OK";
         } else {
             return "NG";
@@ -417,10 +417,10 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteCompanyIdentity(IdentityAuthenticationInfo identityAuthenticationInfo) {
-        List<CommonCompanyIdentity> list = this.commonCompanyIdentityMapper.selectList(new EntityWrapper<CommonCompanyIdentity>()
+        List<CommonCompanyIdentity> list = this.iCommonCompanyIdentityService.selectList(new EntityWrapper<CommonCompanyIdentity>()
                 .eq("com_id", identityAuthenticationInfo.getCompId()).eq("identity_id", identityAuthenticationInfo.getId()));
         for (CommonCompanyIdentity commonCompanyIdentity : list) {
-            this.commonCompanyIdentityMapper.deleteById(commonCompanyIdentity);
+            this.iCommonCompanyIdentityService.deleteById(commonCompanyIdentity);
         }
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchasePriceServiceImpl.java

@@ -11,8 +11,7 @@ import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.*;
-import com.yh.saas.plugin.yiliangyiyun.service.INewWorkflowService;
-import com.yh.saas.plugin.yiliangyiyun.service.IPurchasePriceService;
+import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,11 +35,11 @@ import java.util.Map;
 public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, PurchasePrice> implements IPurchasePriceService {
 
     @Autowired
-    private PurchasePriceDetailMapper purchasePriceDetailMapper;
+    private IPurchasePriceDetailService purchasePriceDetailService;
     @Autowired
-    private PurchasePriceDetailPrintMapper purchasePriceDetailPrintMapper;
+    private IPurchasePriceDetailPrintService purchasePriceDetailPrintService;
     @Autowired
-    private WarehouseBaseInfoMapper warehouseBaseInfoMapper;
+    private IWarehouseBaseInfoService warehouseBaseInfoService;
     @Autowired
     private INewWorkflowService workflowService;
     @Override
@@ -122,14 +121,14 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
                 tmp.setId(IdGenerator.generateUUID());
                 tmp.setCompId(compId);
                 tmp.setMainId(mainId);
-                this.purchasePriceDetailMapper.insert(tmp);
+                this.purchasePriceDetailService.insert(tmp);
             }
             // 操作打印表数据
             for(PurchasePriceDetailPrint tmp : purchasePrice.getDetailPrints()){
                 tmp.setId(IdGenerator.generateUUID());
                 tmp.setCompId(compId);
                 tmp.setMainId(mainId);
-                this.purchasePriceDetailPrintMapper.insert(tmp);
+                this.purchasePriceDetailPrintService.insert(tmp);
             }
             return "ok";
         }
@@ -142,9 +141,9 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
     @Override
     public PurchasePrice purchasePriceLook(PurchasePrice purchasePrice) {
         purchasePrice = this.baseMapper.selectById(purchasePrice.getId());
-        List<PurchasePriceDetail> details = this.purchasePriceDetailMapper.selectList(new EntityWrapper<PurchasePriceDetail>().eq("main_id",purchasePrice.getId()));
+        List<PurchasePriceDetail> details = this.purchasePriceDetailService.selectList(new EntityWrapper<PurchasePriceDetail>().eq("main_id",purchasePrice.getId()));
         purchasePrice.setDetails(details);
-        List<PurchasePriceDetailPrint> detailPrints = this.purchasePriceDetailPrintMapper.selectList(new EntityWrapper<PurchasePriceDetailPrint>().eq("main_id",purchasePrice.getId()));
+        List<PurchasePriceDetailPrint> detailPrints = this.purchasePriceDetailPrintService.selectList(new EntityWrapper<PurchasePriceDetailPrint>().eq("main_id",purchasePrice.getId()));
         purchasePrice.setDetailPrints(detailPrints);
         return purchasePrice;
     }
@@ -154,21 +153,21 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
     public String purchasePriceEdit(PurchasePrice purchasePrice) {
         // 操作主表数据
         this.updateById(purchasePrice);
-        this.purchasePriceDetailMapper.delete(new EntityWrapper<PurchasePriceDetail>().eq("main_id",purchasePrice.getId()));
-        this.purchasePriceDetailPrintMapper.delete(new EntityWrapper<PurchasePriceDetailPrint>().eq("main_id",purchasePrice.getId()));
+        this.purchasePriceDetailService.delete(new EntityWrapper<PurchasePriceDetail>().eq("main_id",purchasePrice.getId()));
+        this.purchasePriceDetailPrintService.delete(new EntityWrapper<PurchasePriceDetailPrint>().eq("main_id",purchasePrice.getId()));
         // 操作明细表数据
         for(PurchasePriceDetail tmp : purchasePrice.getDetails()){
             tmp.setId(IdGenerator.generateUUID());
             tmp.setCompId(purchasePrice.getCompId());
             tmp.setMainId(purchasePrice.getId());
-            this.purchasePriceDetailMapper.insert(tmp);
+            this.purchasePriceDetailService.insert(tmp);
         }
         // 操作打印表数据
         for(PurchasePriceDetailPrint tmp : purchasePrice.getDetailPrints()){
             tmp.setId(IdGenerator.generateUUID());
             tmp.setCompId(purchasePrice.getCompId());
             tmp.setMainId(purchasePrice.getId());
-            this.purchasePriceDetailPrintMapper.insert(tmp);
+            this.purchasePriceDetailPrintService.insert(tmp);
         }
         boolean isStartWorkflow = StringUtils.isBlank(purchasePrice.getWorkflowId());
         // 不是退回的单子
@@ -200,17 +199,17 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String purchasePriceDel(PurchasePrice purchasePrice) {
-        this.purchasePriceDetailMapper.delete(new EntityWrapper<PurchasePriceDetail>().eq("main_id",purchasePrice.getId()));
-        this.purchasePriceDetailPrintMapper.delete(new EntityWrapper<PurchasePriceDetailPrint>().eq("main_id",purchasePrice.getId()));
+        this.purchasePriceDetailService.delete(new EntityWrapper<PurchasePriceDetail>().eq("main_id",purchasePrice.getId()));
+        this.purchasePriceDetailPrintService.delete(new EntityWrapper<PurchasePriceDetailPrint>().eq("main_id",purchasePrice.getId()));
         this.deleteById(purchasePrice);
         return "ok";
     }
 
     @Override
     public String purchasePriceAllowEdit(PurchasePrice purchasePrice) {
-        WarehouseBaseInfo warehouseBaseInfo = this.warehouseBaseInfoMapper.selectById(purchasePrice.getWarehouseId());
+        WarehouseBaseInfo warehouseBaseInfo = this.warehouseBaseInfoService.selectById(purchasePrice.getWarehouseId());
         warehouseBaseInfo.setAllowEdit("1");
-        this.warehouseBaseInfoMapper.updateById(warehouseBaseInfo);
+        this.warehouseBaseInfoService.updateById(warehouseBaseInfo);
         return "ok";
     }
 }