Merge branch 'dev_v1.0.0' into release_v1.0.0

merge

sop-business/src/main/java/com/qmth/sop/business/bean/result/TBQualityProblemApplyResult.java

@@ -101,9 +101,6 @@ public class TBQualityProblemApplyResult extends TBQualityProblemApply implement
         this.sopTypeStr = sopTypeStr;
     }
 
-    public void setSubmissionTime(Long submissionTime) {
-        this.submissionTime = submissionTime;
-    }
 
     public FlowStatusEnum getStatus() {
         return status;
@@ -125,9 +122,6 @@ public class TBQualityProblemApplyResult extends TBQualityProblemApply implement
         this.statusStr = statusStr;
     }
 
-    public void setUpdateDateTime(Long updateDateTime) {
-        this.updateDateTime = updateDateTime;
-    }
 
     public Integer getSetup() {
         return setup;
@@ -201,19 +195,19 @@ public class TBQualityProblemApplyResult extends TBQualityProblemApply implement
         this.submitter = submitter;
     }
 
-    public long getSubmissionTime() {
+    public Long getSubmissionTime() {
         return submissionTime;
     }
 
-    public void setSubmissionTime(long submissionTime) {
+    public void setSubmissionTime(Long submissionTime) {
         this.submissionTime = submissionTime;
     }
 
-    public long getUpdateDateTime() {
+    public Long getUpdateDateTime() {
         return updateDateTime;
     }
 
-    public void setUpdateDateTime(long updateDateTime) {
+    public void setUpdateDateTime(Long updateDateTime) {
         this.updateDateTime = updateDateTime;
     }
 

sop-business/src/main/java/com/qmth/sop/business/entity/SysDevice.java

@@ -11,7 +11,6 @@ import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * <p>

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDeviceInOutServiceImpl.java

@@ -9,14 +9,9 @@ import com.qmth.sop.business.bean.dto.DataPermissionDto;
 import com.qmth.sop.business.bean.params.DeviceInOutForm;
 import com.qmth.sop.business.bean.params.DeviceInOutSubmitParam;
 import com.qmth.sop.business.bean.result.DeviceInOutResult;
-import com.qmth.sop.business.entity.SysDevice;
-import com.qmth.sop.business.entity.SysUser;
-import com.qmth.sop.business.entity.TBDeviceInOut;
+import com.qmth.sop.business.entity.*;
 import com.qmth.sop.business.mapper.TBDeviceInOutMapper;
-import com.qmth.sop.business.service.SequenceService;
-import com.qmth.sop.business.service.SysDeviceService;
-import com.qmth.sop.business.service.SysUserService;
-import com.qmth.sop.business.service.TBDeviceInOutService;
+import com.qmth.sop.business.service.*;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.*;
 import com.qmth.sop.common.util.ServletUtil;
@@ -25,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -44,6 +40,10 @@ public class TBDeviceInOutServiceImpl extends ServiceImpl<TBDeviceInOutMapper, T
     private SequenceService sequenceService;
     @Resource
     private SysUserService sysUserService;
+    @Resource
+    private TBCrmService tbCrmService;
+    @Resource
+    private SysCustomService sysCustomService;
 
     @Override
     public IPage<DeviceInOutResult> findDeviceInOutPageBySop(Long serviceUnitId, DeviceUsageTypeEnum usageType, Long userId, DeviceStatusEnum deviceStatus, Long inOutTimeStart, Long inOutTimeEnd, String deviceNo, String customName, String location, String address, String serialNo, Integer pageNumber, Integer pageSize) {
@@ -102,6 +102,21 @@ public class TBDeviceInOutServiceImpl extends ServiceImpl<TBDeviceInOutMapper, T
 
         Long serviceUnitId = deviceInOutSubmitParam.getServiceUnitId();
         String crmNo = deviceInOutSubmitParam.getCrmNo();
+        String customName = null;
+        if (crmNo != null && crmNo.length() > 0){
+            TBCrm tbCrm = tbCrmService.findByCrmNo(crmNo);
+            if (Objects.nonNull(tbCrm)){
+                Long customId = tbCrm.getCustomId();
+                SysCustom sysCustom = sysCustomService.getById(customId);
+                if (Objects.nonNull(sysCustom)){
+                    customName = sysCustom.getName();
+                }
+            }
+
+
+        }
+
+
         String sopNo = deviceInOutSubmitParam.getSopNo();
 
         DeviceUsageTypeEnum usageType;
@@ -115,6 +130,7 @@ public class TBDeviceInOutServiceImpl extends ServiceImpl<TBDeviceInOutMapper, T
         }
 
         List<DeviceInOutForm> deviceInOutFormList = deviceInOutSubmitParam.getDeviceInOutFormList();
+        String finalCustomName = customName;
         List<TBDeviceInOut> tbDeviceInOutList = deviceInOutFormList.stream().flatMap(e -> {
             TBDeviceInOut tbDeviceInOut = new TBDeviceInOut();
             if (serviceUnitId != null && serviceUnitId > 0) {
@@ -142,6 +158,9 @@ public class TBDeviceInOutServiceImpl extends ServiceImpl<TBDeviceInOutMapper, T
             tbDeviceInOut.setUsageType(usageType);
             tbDeviceInOut.setBasePhotoPath(e.getBasePhotoPath());
             tbDeviceInOut.setInOutTime(inOutTime);
+            if (finalCustomName != null && finalCustomName.length() > 0){
+                tbDeviceInOut.setCustomName(finalCustomName);
+            }
 
             UpdateWrapper<SysDevice> updateWrapper = new UpdateWrapper<>();
             updateWrapper.lambda()