报表调整&登录不验证手机号

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10033_202400ReportOFData.java

@@ -7,6 +7,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTas
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderuser.BoilerTaskOrderUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbcol.DynamicTbColDO;
+import cn.start.tz.module.pressure2.dal.dataobject.dynamictbins.DynamicTbInsDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbval.DynamicTbValDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderuser.PipeTaskOrderUserDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorder.BoilerTaskOrderMapper;
@@ -18,6 +19,7 @@ import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.InspectorInfoUtil;
 import cn.start.tz.module.pressure2.service.dynamictbcol.DynamicTbColService;
+import cn.start.tz.module.pressure2.service.dynamictbins.DynamicTbInsService;
 import cn.start.tz.module.pressure2.service.dynamictbval.DynamicTbValService;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
@@ -58,6 +60,9 @@ public class QC10033_202400ReportOFData implements IDynamicOFData {
     @Resource
     private DynamicTbValService dynamicTbValService;
 
+    @Resource
+    private DynamicTbInsService dynamicTbInsService;
+
     @Resource
     private GenerateReportJsonService generateReportJsonService;
 
@@ -91,8 +96,14 @@ public class QC10033_202400ReportOFData implements IDynamicOFData {
             EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
             if (equipBoilerDO != null){
                 //设备信息
-                result.put("workPressure",equipBoilerDO.getWorkpressure());
-                result.put("testMedium",equipBoilerDO.getTestmedium());
+                //只需第一次初始化的数据
+                DynamicTbInsDO firstInsDO = dynamicTbInsService.getDynamicRefId(refId);
+                if (firstInsDO == null) {
+                    result.put("pressure",equipBoilerDO.getWorkpressure());
+                    result.put("medium",equipBoilerDO.getTestmedium());
+                    result.put("temperature",equipBoilerDO.getRatedExportTemperature());
+                }
+
             }
 
             String orderId = itemReportDO.getOrderId();

tz-module-system/tz-module-system-biz/src/main/java/cn/start/tz/module/system/service/auth/AdminAuthServiceImpl.java

@@ -169,7 +169,8 @@ public class AdminAuthServiceImpl implements AdminAuthService {
         // 使用账号密码，进行账号验证
         AdminUserDO user = authenticate(reqVO.getUsername(), reqVO.getPassword());
         if (StrUtil.isEmpty(user.getMobile())) {
-            throw exception(AUTH_MOBILE_NOT_EXISTS);
+//            throw exception(AUTH_MOBILE_NOT_EXISTS);
+            return user.getUsername();
         }
         return user.getMobile();
     }