Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/pom.xml

@@ -20,12 +20,12 @@
 			<artifactId>amos-boot-module-jcs-api</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
-      <dependency>
+     <!--  <dependency>
           <groupId>com.amosframework.boot</groupId>
           <artifactId>amos-boot-module-maintenance-biz</artifactId>
           <version>1.0.0</version>
           <scope>compile</scope>
-      </dependency>
+      </dependency> -->
       <!-- <dependency>
            <groupId>com.amosframework.boot</groupId>
            <artifactId>amos-boot-module-patrol-biz</artifactId>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureAuditServiceImpl.java

@@ -8,6 +8,9 @@ import com.yeejoin.amos.boot.module.common.api.enums.AuditResultEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
 import com.yeejoin.amos.boot.module.common.api.mapper.FailureAuditMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFailureAuditService;
+
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -49,11 +52,11 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
 
         this.createWithModel(model);
         Integer auditResult = model.getAuditResult();
-        if (auditResult.equal(AuditResultEnum.AGREE.getCode())) {
+        if (auditResult.equals(AuditResultEnum.AGREE.getCode())) {
             updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN.getCode());
-        } else if (auditResult.equal( AuditResultEnum.REFUSE.getCode())) {
+        } else if (auditResult.equals( AuditResultEnum.REFUSE.getCode())) {
             updateStatus(model, FailureStatuEnum.REFUSE.getCode());
-        }else if (auditResult.equal(AuditResultEnum.SEND_BACK.getCode())){
+        }else if (auditResult.equals(AuditResultEnum.SEND_BACK.getCode())){
             updateStatus(model, FailureStatuEnum.WAITING_SUBMIT.getCode());
         }
         return model;

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
-import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
-
-import com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper;
-import com.yeejoin.amos.boot.module.common.api.service.IFailureDetailsService;
+import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
+import com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFailureDetailsService;
 
 /**
  * 服务实现类
@@ -33,12 +30,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     @Autowired
     SourceFileServiceImpl sourceFileServiceImpl;
 
-    @Autowired
-    private RemoteWorkFlowService remoteWorkFlowService;
 
     @Value("${params.work.flow.processDefinitionKey}")
     private String processDefinitionKey;
-*/
 
     private final Logger logger = LoggerFactory.getLogger(FailureDetailsServiceImpl.class);
 
@@ -70,23 +64,23 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
     /**
      * 发起故障保修单
      */
-      /*  public CommonResponse savemodel(FailureDetailsDto failureDetailsDto) {
-    String businessKey = RandomUtil.buildOrderNo();
-        JSONObject jsonObject = remoteWorkFlow.start( businessKey, processDefinitionKey);
-        if (jsonObject == null) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return CommonResponseUtil.failure("启动流程失败");
-        }
-        JSONObject instance = jsonObject.getJSONObject("data");
-        if(instance==null){
-            return CommonResponseUtil.failure("无提交隐患权限");
-        }
-        failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_AUDIT.getCode());
-        FailureDetailsDto model = this.createWithModel(failureDetailsDto);
-
-        sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), failureDetailsDto.getAttachment());
-        return CommonResponseUtil.success(model);
-    }*/
+//       public CommonResponse savemodel(FailureDetailsDto failureDetailsDto) {
+//    String businessKey = RandomUtil.buildOrderNo();
+//        JSONObject jsonObject = remoteWorkFlow.start( businessKey, processDefinitionKey);
+//        if (jsonObject == null) {
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//            return CommonResponseUtil.failure("启动流程失败");
+//        }
+//        JSONObject instance = jsonObject.getJSONObject("data");
+//        if(instance==null){
+//            return CommonResponseUtil.failure("无提交隐患权限");
+//        }
+//        failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_AUDIT.getCode());
+//        FailureDetailsDto model = this.createWithModel(failureDetailsDto);
+//
+//        sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), failureDetailsDto.getAttachment());
+//        return CommonResponseUtil.success(model);
+//    }
 
 
 }
\ No newline at end of file