1

src/main/java/com/chinaitop/depot/sqr/service/impl/BizSqrEnterpriseApplyServiceImpl.java

@@ -132,7 +132,10 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
                     bizSqrEnterpriseApplyMapper.delete(bizSqrEnterpriseApply.getId());
                     saveAndcreatEbizSqrEnterprise(bizSqrEnterpriseApply,userName);
                 }else{
-                    saveAndcreatEbizSqrEnterprise(bizSqrEnterpriseApply,userName);
+
+                        saveAndcreatEbizSqrEnterprise(bizSqrEnterpriseApply,userName);
+
+
                 }
             }
 
@@ -175,24 +178,29 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
 
     private int saveAndcreatEbizSqrEnterprise(BizSqrEnterpriseApply bizSqrEnterpriseApply,String userName){
         BizSqrEnterprise bizSqrEnterprise = new BizSqrEnterprise();
-
-        long snowflakeId = IdUtil.getSnowflake().nextId();
-        bizSqrEnterprise.setId(String.valueOf(snowflakeId));
-        bizSqrEnterprise.setUnitInfoId(bizSqrEnterpriseApply.getUnitInfoId());
-        bizSqrEnterprise.setFullTimeStaffCount(bizSqrEnterpriseApply.getFullTimeStaffCount());
-        bizSqrEnterprise.setCertifiedStorekeeperCount(bizSqrEnterpriseApply.getCertifiedStorekeeperCount());
-        bizSqrEnterprise.setCertifiedInspectorCount(bizSqrEnterpriseApply.getCertifiedInspectorCount());
-        bizSqrEnterprise.setStorageExpireTime(bizSqrEnterpriseApply.getStorageExpireTime());
-        bizSqrEnterprise.setWarehouseFacilitySituation(bizSqrEnterpriseApply.getWarehouseFacilitySituation());
-        bizSqrEnterprise.setAttachment(bizSqrEnterpriseApply.getAttachment());
-        bizSqrEnterprise.setStatus(bizSqrEnterpriseApply.getApplyStatus());
-        bizSqrEnterprise.setCreateTime(new Date());
-        bizSqrEnterprise.setUpdateTime(new Date());
-        bizSqrEnterpriseService.add(bizSqrEnterprise);
-        bizSqrEnterpriseApply.setSqrEnterpriseId(bizSqrEnterprise.getId());
+        if(bizSqrEnterpriseApply.getApplyType()==1) {
+            long snowflakeId = IdUtil.getSnowflake().nextId();
+            bizSqrEnterprise.setId(String.valueOf(snowflakeId));
+            bizSqrEnterprise.setUnitInfoId(bizSqrEnterpriseApply.getUnitInfoId());
+            bizSqrEnterprise.setFullTimeStaffCount(bizSqrEnterpriseApply.getFullTimeStaffCount());
+            bizSqrEnterprise.setCertifiedStorekeeperCount(bizSqrEnterpriseApply.getCertifiedStorekeeperCount());
+            bizSqrEnterprise.setCertifiedInspectorCount(bizSqrEnterpriseApply.getCertifiedInspectorCount());
+            bizSqrEnterprise.setStorageExpireTime(bizSqrEnterpriseApply.getStorageExpireTime());
+            bizSqrEnterprise.setWarehouseFacilitySituation(bizSqrEnterpriseApply.getWarehouseFacilitySituation());
+            bizSqrEnterprise.setAttachment(bizSqrEnterpriseApply.getAttachment());
+            bizSqrEnterprise.setStatus(bizSqrEnterpriseApply.getApplyStatus());
+            bizSqrEnterprise.setCreateTime(new Date());
+            bizSqrEnterprise.setUpdateTime(new Date());
+            bizSqrEnterpriseService.add(bizSqrEnterprise);
+            bizSqrEnterpriseApply.setSqrEnterpriseId(bizSqrEnterprise.getId());
+            bizSqrEnterpriseApply.setCreateTime(new Date());
+            bizSqrEnterpriseApply.setUpdateTime(new Date());
+            return bizSqrEnterpriseApplyMapper.insert(bizSqrEnterpriseApply);
+        }
         bizSqrEnterpriseApply.setCreateTime(new Date());
         bizSqrEnterpriseApply.setUpdateTime(new Date());
-       return bizSqrEnterpriseApplyMapper.insert(bizSqrEnterpriseApply);
+        return bizSqrEnterpriseApplyMapper.insert(bizSqrEnterpriseApply);
+
     }
 
     private void saveAndcreatRequest(BizSqrEnterpriseApply bizSqrEnterpriseApply,String userName){