bugfix:openapi启动找不到类问题修改（气瓶原CylinderFillingMessageService类移至openapi…

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderFillingMessageService.java

+package com.yeejoin.amos.api.openapi.face.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingMessageModel;
+import com.yeejoin.amos.boot.module.cylinder.api.dto.PageParam;
+import com.yeejoin.amos.boot.module.cylinder.api.dto.TzBaseEnterpriseInfoDto;
+import com.yeejoin.amos.boot.module.cylinder.api.entity.CylinderFillingMessageEntity;
+import com.yeejoin.amos.boot.module.cylinder.api.mapper.CylinderFillingMessageMapper;
+import com.yeejoin.amos.boot.module.cylinder.api.mapper.TzBaseEnterpriseInfoMapper;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Component
+public class TmCylinderFillingMessageService extends BaseService<CylinderFillingMessageModel, CylinderFillingMessageEntity, CylinderFillingMessageMapper> {
+
+    private final TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+
+    public TmCylinderFillingMessageService(TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper) {
+        this.tzBaseEnterpriseInfoMapper = tzBaseEnterpriseInfoMapper;
+    }
+
+    public IPage<CylinderFillingMessageModel> getUploadCylinderLogs(PageParam pageParam, String regionCode) {
+        CompanyModel result = Privilege.companyClient.queryByCompanyCode(regionCode).getResult();
+        Page<CylinderFillingMessageModel> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+        if(result != null){
+            IPage<CylinderFillingMessageModel> uploadCylinderLogsByOrgCode = getUploadCylinderLogsByOrgCode(page, result.getOrgCode());
+            List<String> appIds = uploadCylinderLogsByOrgCode.getRecords().stream().map(CylinderFillingMessageModel::getAppId).collect(Collectors.toList()).stream().filter(x -> !ValidationUtil.isEmpty(x)).distinct().collect(Collectors.toList());
+            if(!appIds.isEmpty()){
+                List<TzBaseEnterpriseInfoDto> tzBaseEnterpriseInfoDtos = tzBaseEnterpriseInfoMapper.queryByAppId(appIds);
+                if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfoDtos)){
+                    Map<String, String> map = tzBaseEnterpriseInfoDtos.stream().collect(Collectors.toMap(TzBaseEnterpriseInfoDto::getAppId, TzBaseEnterpriseInfoDto::getUseUnitCode));
+                    uploadCylinderLogsByOrgCode.getRecords().forEach(x -> {
+                        x.setUseUnitCode(map.get(x.getAppId()));
+                    });
+                }
+            }
+        }
+        return page;
+    }
+
+    public IPage<CylinderFillingMessageModel> getUploadCylinderLogsByOrgCode(Page<CylinderFillingMessageModel> page, @Condition(Operator.likeRight) String orgCode) {
+        return queryForPage(page, null, false, orgCode);
+    }
+}

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/JgMaintenanceContractServiceImpl.java

@@ -803,8 +803,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         if ( WorkFlowStatusEnum.MAIN_SUBMIT.getPass().contains(status)) {
             return FlowStatusEnum.TO_BE_SUBMITTED;
         }
-
-        if ( WorkFlowStatusEnum.MAIN_PRELIMINARY.getPass().contains(status)) {
+        if ( FlowStatusEnum.TO_BE_FINISHED.getName().equals(status)) {
             return FlowStatusEnum.TO_BE_FINISHED;
         }
         return FlowStatusEnum.TO_BE_PROCESSED;

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/dto/CylinderFillingMessageModel.java

+package com.yeejoin.amos.boot.module.statistics.api.dto;
+
+import lombok.Data;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+
+@Data
+public class CylinderFillingMessageModel extends BaseModel {
+    private String time;
+    private String fillingCompanyName;
+    private Integer cylinderNumber;
+    private String message;
+    private String appId;
+    private String orgCode;
+    private String useUnitCode;
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/CylinderOpenApiServiceImpl.java

+package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.statistics.api.dto.CylinderFillingMessageModel;
+import com.yeejoin.amos.boot.module.statistics.api.mapper.CylinderStatisticsMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+
+@DS("cyl")
+@Service
+public class CylinderOpenApiServiceImpl {
+
+    private final CylinderStatisticsMapper cylinderStatisticsMapper;
+
+    public CylinderOpenApiServiceImpl(CylinderStatisticsMapper cylinderStatisticsMapper) {
+        this.cylinderStatisticsMapper = cylinderStatisticsMapper;
+    }
+
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public IPage<CylinderFillingMessageModel> getUploadCylinderLogsByOrgCode(Page<CylinderFillingMessageModel> page, @Condition(Operator.likeRight) String orgCode) {
+        return cylinderStatisticsMapper.getUploadCylinderLogsPage(page, orgCode);
+    }
+}

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgRegisterInfoMapper.xml

@@ -7,7 +7,7 @@
 		FROM idx_biz_jg_construction_info jci
 		LEFT JOIN idx_biz_jg_use_info jui ON jci.RECORD = jui.RECORD
 		<where>
-			jui.PROJECT_CONTRAPTION IS NOT NULL
+			jui.PROJECT_CONTRAPTION IS NOT NULL AND TRIM ( jui.PROJECT_CONTRAPTION ) <![CDATA[ <> ]]> ''
 			<if test="uscUnitCreditCode != null and !uscUnitCreditCode.isEmpty()">
 				AND jci.USC_UNIT_CREDIT_CODE = #{uscUnitCreditCode}
 			</if>