1

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

@@ -151,7 +151,7 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
 
         }else { //提交
             //if(bizSqrEnterpriseApplyId!=0){
-                if(bizSqrEnterpriseApply.getId()!=null){//n
+                if(bizSqrEnterpriseApply.getId()!=null){
 
                     if(bizSqrEnterpriseApply.getApplyType()!=4){
                         bizSqrEnterpriseService.delete(bizSqrEnterpriseApply.getSqrEnterpriseId());
@@ -170,9 +170,11 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
                         saveAndcreatEbizSqrEnterprise(bizSqrEnterpriseApply,userName);
                         saveAndcreatRequest(bizSqrEnterpriseApply,userName);
                     }else{
+                        bizSqrEnterpriseApplyMapper.delete(bizSqrEnterpriseApply.getId());
                         bizSqrEnterpriseApply.setCreateTime(new Date());
                         bizSqrEnterpriseApply.setUpdateTime(new Date());
-                        bizSqrEnterpriseApplyMapper.insert(bizSqrEnterpriseApply);
+                        saveAndcreatEbizSqrEnterprise(bizSqrEnterpriseApply,userName);
+                        saveAndcreatRequest(bizSqrEnterpriseApply,userName);
                     }
                 }
 
@@ -224,8 +226,8 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
         AuditRequest auditRequest =new AuditRequest();
         AuditRecord  auditRecord =new AuditRecord();
         auditRequest.setId(String.valueOf(snowflakeId));
-        auditRequest.setType(3);
-        auditRequest.setStep(3);
+        auditRequest.setType(bizSqrEnterpriseApply.getApplyType());
+        auditRequest.setStep(bizSqrEnterpriseApply.getApplyType());
         auditRequest.setRequestId(bizSqrEnterpriseApply.getId()+"");
         auditRequest.setAuditStatus(0);
         auditRequest.setCreateTime(new Date());
@@ -234,8 +236,8 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
         long auditRecordId = IdUtil.getSnowflake().nextId();
         auditRecord.setId(auditRecordId);
         auditRecord.setAuditRequestId(auditRequest.getId());
-        auditRecord.setType(3);
-        auditRecord.setStep(3);
+        auditRecord.setType(bizSqrEnterpriseApply.getApplyType());
+        auditRecord.setStep(bizSqrEnterpriseApply.getApplyType());
         auditRecord.setRequestId(bizSqrEnterpriseApply.getId()+"");
         auditRecord.setAuditStatus(0);
         auditRecord.setCreateTime(new Date());