Merge branch 'refs/heads/develop_tzs_register_test' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgReformNoticeDto.java

@@ -181,9 +181,6 @@ public class JgReformNoticeDto extends BaseDto {
     @ApiModelProperty (value = "告知设备列表")
     private List<Map<String, Object>> deviceList;
 
-    @ApiModelProperty(value = "管道列表")
-    private List<Map<String, Object>> pipelineList;
-
     @ApiModelProperty(value = "删除的管道列表")
     private List<Map<String, Object>> delPipelineList;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJgProjectContraptionController.java

@@ -140,7 +140,10 @@ public class IdxBizJgProjectContraptionController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个管道工程装置表", notes = "根据sequenceNbr查询单个管道工程装置表")
 	// 传record的原因是前端组件内部写死了，此处是工程装置表seq
 	public ResponseModel<Object> detailsNotFormId(@RequestParam("record") String sequenceNbr) {
-		return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.details(sequenceNbr).get(EQUIP_INFO_FORM_ID));
+		Map<String, Object> objectMap = idxBizJgProjectContraptionServiceImpl.details(sequenceNbr).get(EQUIP_INFO_FORM_ID);
+		Object pipelineListObj = objectMap.remove("pipelineList");
+		objectMap.put("deviceList", pipelineListObj);
+		return ResponseHelper.buildResponse(objectMap);
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgInstallationNoticeServiceImpl.java

@@ -814,7 +814,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             List<Object> factoryNumList = deviceList.stream().limit(3).map(item -> item.get("pipelineNumber")).collect(Collectors.toList());
             placeholders.put("equipTypeList", equipTypeList);
             placeholders.put("produceCodeList", factoryNumList);
-            placeholders.put("productName", historyJson.get("projectContraption"));
+            placeholders.put("productName", Optional.ofNullable(historyJson.get("projectContraption")).orElse(historyJson.get("PROJECT_CONTRAPTION")));
         } else {
             placeholders.put("equipType", getValue.apply("equType"));
             placeholders.put("produceCode", getValue.apply("factoryNum"));

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/job/MonthCylinderBusinessStatisticsJob.java

@@ -32,7 +32,7 @@ public class MonthCylinderBusinessStatisticsJob {
         this.businessStatisticsMapper = businessStatisticsMapper;
     }
 
-    @Scheduled(cron = "0 */5 * * * ?")
+    @Scheduled(cron = "0 0 2 * * ?")
     @SchedulerLock(name = "cylinderBusinessStatisticsJob", lockAtMostFor = "PT1H")
     public void cylinderBusinessStatisticsJob() {
         List<Map<String, Object>> useRegisterCountList = useRegistrationMapper.getUseRegisterCountTotal();