Prechádzať zdrojové kódy

初始化鉴定记录

guarantee-lsq 2 rokov pred
rodič
commit
3bf957ec01

+ 4 - 0
platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbInfoVO.java

@@ -202,5 +202,9 @@ public class ExportSbInfoVO implements Serializable {
     private String fbbz;
     @Excel(name="防爆合格证号",styleType=1)
     private String fbhgzh;
+    @Excel(name="轴承型号",styleType=1)
+    private String zcxh;
+    @Excel(name="风叶型号",styleType=1)
+    private String fyxh;
 
 }

+ 6 - 0
platform-rest/src/main/java/com/platform/rest/controller/sb/SbMeasureLogController.java

@@ -156,4 +156,10 @@ public class SbMeasureLogController {
     ExcelUtil.exportResponseDict(response, ExportSbMeasureLogVO.class, BeanConverterUtil.copyListProperties(list, ExportSbMeasureLogVO.class), "计量设备检定记录");
   }
 
+  @GetMapping("/generate/init")
+  public R generateInit() {
+    sbMeasureLogService.generateInitLog();
+    return new R<>();
+  }
+
 }

+ 1 - 0
platform-rest/src/main/resources/application-dev.yml

@@ -76,6 +76,7 @@ ignore:
     - /ignores/**
     - /wechat/**
     - /yongyou/**
+    - /sb/measure-logs/generate/init
 
 
 platform:

+ 1 - 0
platform-rest/src/main/resources/application-test.yml

@@ -54,6 +54,7 @@ ignore:
     - /ignores/**
     - /wechat/**
     - /yongyou/**
+    - /sb/measure-logs/generate/init
 
 platform:
   slf4j:

+ 2 - 0
platform-service/src/main/java/com/platform/service/sb/SbMeasureLogService.java

@@ -58,4 +58,6 @@ public interface SbMeasureLogService extends IBaseService<SbMeasureLog, SbMeasur
      * 批量在库
      */
     void saveBatchIn(BatchSbMeasureLog batchSbMeasureLog);
+
+    void generateInitLog();
 }

+ 27 - 0
platform-service/src/main/java/com/platform/service/sb/impl/SbMeasureLogServiceImpl.java

@@ -9,6 +9,7 @@ import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.sb.BatchSbMeasureLog;
 import com.platform.dao.dto.sb.SbChangeRecordDTO;
+import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.sb.SbMeasureLogDTO;
 import com.platform.dao.entity.check.CheckProjectStandardRelation;
 import com.platform.dao.entity.sb.SbChangeRecord;
@@ -23,6 +24,7 @@ import com.platform.dao.enums.YesNoEnum;
 import com.platform.dao.mapper.sb.*;
 import com.platform.dao.vo.query.sb.SbMeasureLogVO;
 import com.platform.dao.vo.report.MeasureLogReportVO;
+import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.sb.SbMeasureLogService;
 import com.platform.service.upms.SysFileService;
@@ -489,6 +491,31 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         }
     }
 
+    @Override
+    public void generateInitLog() {
+        SbInfoDTO sbInfoDTO = new SbInfoDTO();
+        sbInfoDTO.setUseType(4);
+        sbInfoDTO.setIsMeasure(1);
+        List<SbInfoVO> list = sbInfoMapper.selectVOList(sbInfoDTO);
+        List<SbMeasureLog> logList = ListUtils.newArrayList();
+        list.forEach(item -> {
+            SbMeasureLog log = new SbMeasureLog();
+            log.setName("huangrh");
+            log.setLastDate(item.getCheckDate());
+            log.setType(1);
+            log.setCheckUserId("62d61960030de40d4cdd579f");
+            log.setRequirement("龙岩质检");
+            log.setCreatedUserId("62d61960030de40d4cdd579f");
+            log.setCreatedTime(LocalDateTime.now());
+            log.setCreatedUserName("黄汝煌");
+            log.setUpdateTime(LocalDateTime.now());
+            log.setSbId(item.getId());
+            log.setId(IdGeneratorUtils.getObjectId());
+            logList.add(log);
+        });
+        mapper.insertList(logList);
+    }
+
     /**
      * 入库
      * @param sbId