Merge branch 'master' into dev_js_20260407

lidee-core/src/main/java/com/lideeyunji/core/framework/controller/ByglController.java

@@ -5,6 +5,7 @@ import com.lideeyunji.core.framework.service.IByglByfaService;
 import com.lideeyunji.tool.framework.common.constant.lideeYunJiBaseConstant;
 import com.lideeyunji.tool.framework.constants.FrameErrorCodeConstants;
 import com.lideeyunji.tool.framework.yunji.model.global.BaseWebResult;
+import com.lideeyunji.tool.framework.yunji.utils.FuncBase;
 import com.lideeyunji.tool.framework.yunji.utils.lideeYunJiUtils;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
@@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Tag(name = "保养管理-保养方案")
@@ -36,4 +39,20 @@ public class ByglController extends BaseController {
     }
 
 
+    @PostMapping("/getByWxXx")
+    public BaseWebResult getByWxXx(@RequestBody Map<String,Object> model) {
+        String dev_code = lideeYunJiUtils.getMap2Str(model, "dev_code");
+        String dev_type = lideeYunJiUtils.getMap2Str(model, "dev_type");
+        if (FuncBase.isEmpty(dev_code) || FuncBase.isEmpty(dev_type)) {
+            return BaseWebResult.successNull();
+        }
+        List<Map<String,Object>> by = byglByfaService.getByXx(dev_type, dev_code);
+        List<Map<String,Object>> wx = byglByfaService.getWxXx(dev_type, dev_code);
+        Map<String , List<Map<String,Object>>> map = new HashMap<>();
+        map.put("by",by);
+        map.put("wx",wx);
+        return BaseWebResult.success(map);
+    }
+
+
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/enhance/example/report/bygl/ByglBygdBjPlugin.java

@@ -140,6 +140,7 @@ public class ByglBygdBjPlugin implements AroundAdvicePlugin {
         jl.setOrderId(gd.getOrderId());
         jl.setOrderName(gd.getOrderName());
         jl.setEquipmentInfo(gd.getEquipmentInfo());
+        jl.setEquipmentCode(gd.getEquipmentCode());
         jl.setUpkeepLevel(gd.getUpkeepLevel());
         jl.setUpkeepTime(gd.getUpkeepTime());
         jl.setPriority(gd.getPriority());

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ByManagementJl.java

@@ -33,6 +33,11 @@ public class ByManagementJl extends BaseTenantEntity {
      */
     private String equipmentInfo;
 
+    /**
+     *设备编号
+     */
+    private String equipmentCode;
+
     /**
      *优先级
      */

lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ByManagementYs.java

@@ -34,6 +34,11 @@ public class ByManagementYs extends BaseTenantEntity {
      */
     private String equipmentInfo;
 
+    /**
+     *设备编号
+     */
+    private String equipmentCode;
+
     /**
      *优先级
      */
@@ -64,5 +69,15 @@ public class ByManagementYs extends BaseTenantEntity {
      */
     private String ysTime;
 
+    /**
+     *评价星级
+     */
+    private String pjxj;
+
+    /**
+     *验收意见
+     */
+    private String gdysYj;
+
 }
 

lidee-core/src/main/java/com/lideeyunji/core/framework/mapper/ByglByfaMapper.java

@@ -3,6 +3,9 @@ package com.lideeyunji.core.framework.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.Master;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  *保养管理-保养方案
  */
@@ -10,4 +13,8 @@ import com.baomidou.dynamic.datasource.annotation.Master;
 public interface ByglByfaMapper {
 
     int changeFaState(String id, String state);
+
+    List<Map<String, Object>> getByXx(String dev_type, String dev_code);
+
+    List<Map<String, Object>> getWxXx(String dev_type, String dev_code);
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/service/IByglByfaService.java

@@ -1,10 +1,17 @@
 
 package com.lideeyunji.core.framework.service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 保养管理-保养方案
  */
 public interface IByglByfaService {
 
     int changeFaState(String id, String state);
+
+    List<Map<String, Object>> getByXx(String dev_type, String dev_code);
+
+    List<Map<String, Object>> getWxXx(String dev_type, String dev_code);
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ByglByfaServiceImpl.java

@@ -7,6 +7,9 @@ import com.lideeyunji.core.framework.service.IByglByfaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  *保养管理-保养方案
  */
@@ -21,4 +24,16 @@ public class ByglByfaServiceImpl implements IByglByfaService {
 		int result = byglByfaMapper.changeFaState(id, state);
 		return result;
 	}
+
+	@Override
+	public List<Map<String, Object>> getByXx(String dev_type, String dev_code) {
+
+		return byglByfaMapper.getByXx(dev_type, dev_code);
+	}
+
+	@Override
+	public List<Map<String, Object>> getWxXx(String dev_type, String dev_code) {
+
+		return byglByfaMapper.getWxXx(dev_type, dev_code);
+	}
 }

lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/GrNhServiceImpl.java

@@ -35,27 +35,27 @@ public class GrNhServiceImpl extends ServiceImpl<GrNhMapper, GrNhEntity> impleme
     @Override
     @DSTransactional
     public Integer deltetNH(GrNhEntity grNhEntity) {
-        GrNhEntity old =   baseMapper.selectOne(new Wrapper<GrNhEntity>() {
+//        GrNhEntity old =   baseMapper.selectOne(new Wrapper<GrNhEntity>() {
-            @Override
+//            @Override
-            public GrNhEntity getEntity() {
+//            public GrNhEntity getEntity() {
-                return null;
+//                return null;
-            }
+//            }
-
+//
-            @Override
+//            @Override
-            public MergeSegments getExpression() {
+//            public MergeSegments getExpression() {
-                return null;
+//                return null;
-            }
+//            }
-
+//
-            @Override
+//            @Override
-            public void clear() {
+//            public void clear() {
-
+//
-            }
+//            }
-
+//
-            @Override
+//            @Override
-            public String getSqlSegment() {
+//            public String getSqlSegment() {
-                return "";
+//                return "";
-            }
+//            }
-        }).setAddTime(new Date());
+//        }).setAddTime(new Date());
         int re = this.baseMapper.deltetNH(lideeYunJiBaseConstant.DS_ERP_BI_DATA, grNhEntity);
         return re;
     }
@@ -65,27 +65,27 @@ public class GrNhServiceImpl extends ServiceImpl<GrNhMapper, GrNhEntity> impleme
     @Override
     @DSTransactional
     public Integer saveNH(GrNhEntity grNhEntity) {
-        GrNhEntity old =   baseMapper.selectOne(new Wrapper<GrNhEntity>() {
+//        GrNhEntity old =   baseMapper.selectOne(new Wrapper<GrNhEntity>() {
-            @Override
+//            @Override
-            public GrNhEntity getEntity() {
+//            public GrNhEntity getEntity() {
-                return null;
+//                return null;
-            }
+//            }
-
+//
-            @Override
+//            @Override
-            public MergeSegments getExpression() {
+//            public MergeSegments getExpression() {
-                return null;
+//                return null;
-            }
+//            }
-
+//
-            @Override
+//            @Override
-            public void clear() {
+//            public void clear() {
-
+//
-            }
+//            }
-
+//
-            @Override
+//            @Override
-            public String getSqlSegment() {
+//            public String getSqlSegment() {
-                return "";
+//                return "";
-            }
+//            }
-        }).setAddTime(new Date());
+//        }).setAddTime(new Date());
         int re = this.baseMapper.save(lideeYunJiBaseConstant.DS_ERP_BI_DATA, grNhEntity);
         return re;
     }

lidee-core/src/main/resources/mapper/bygl/ByglByfaMapper.xml

@@ -5,4 +5,27 @@
     <update id="changeFaState">
         update by_management_fa set state = #{state} where id = #{id}
     </update>
+
+
+    <select id="getByXx" resultType="java.util.Map">
+        SELECT
+            *
+        FROM
+            by_management_gd
+        WHERE
+            is_deleted = 0
+          AND device_type_name = #{dev_type} AND LOCATE(#{dev_code}, equipment_code) > 0
+    </select>
+
+
+
+    <select id="getWxXx" resultType="java.util.Map">
+        SELECT
+            *
+        FROM
+            dev_gzbx_wxgd
+        WHERE
+            is_deleted = 0
+          AND dev_type = #{dev_type} AND dev_no = #{dev_code}
+    </select>
 </mapper>

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/SblxController.java

@@ -1,7 +1,5 @@
 package com.lideeyunji.service.system.controller;
 
-import com.lideeyunji.service.system.controller.vo.dept.dept.DeptRespVO;
-import com.lideeyunji.service.system.controller.vo.dept.dept.DeptSimpleRespVO;
 import com.lideeyunji.service.system.controller.vo.sblx.SblxListReqVO;
 import com.lideeyunji.service.system.controller.vo.sblx.SblxRespVO;
 import com.lideeyunji.service.system.controller.vo.sblx.SblxSaveReqVO;
@@ -77,9 +75,9 @@ public class SblxController {
     @Operation(tags = "设备类型管理",summary = "获得设备类型信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('system:sblx:query')")
-    public CommonResult<DeptRespVO> getDept(@RequestParam("id") Long id) {
+    public CommonResult<SblxRespVO> getDept(@RequestParam("id") Long id) {
         SblxDO sblx = sblxService.getSblx(id);
-        return success(BeanUtils.toBean(sblx, DeptRespVO.class));
+        return success(BeanUtils.toBean(sblx, SblxRespVO.class));
     }
 
 }

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/sblx/SblxRespVO.java

@@ -18,6 +18,9 @@ public class SblxRespVO {
     @Schema(description = "设备类型编码", requiredMode = Schema.RequiredMode.REQUIRED)
     private String industryCode;
 
+    @Schema(description = "所属部门", example = "1024")
+    private Long deptId;
+
     @Schema(description = "父设备类型 ID", example = "1024")
     private Long parentId;
 

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/sblx/SblxSaveReqVO.java

@@ -27,6 +27,9 @@ public class SblxSaveReqVO {
     @Schema(description = "父设备类型 ID", example = "1024")
     private Long parentId;
 
+    @Schema(description = "所属部门", example = "1024")
+    private Long deptId;
+
     @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     @NotNull(message = "显示顺序不能为空")
     private Integer sort;

lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/entity/SblxDO.java

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.lideeyunji.tool.framework.common.enums.CommonStatusEnum;
 import com.lideeyunji.tool.framework.mybatis.core.dataobject.BaseDO;
 import com.lideeyunji.tool.framework.tenant.core.db.TenantBaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * 设备类型表
  *
@@ -41,6 +44,11 @@ public class SblxDO extends BaseDO {
      */
     private Long parentId;
 
+    /**
+     * 所属部门
+     */
+    private Long deptId;
+
     /**
      * 显示顺序
      */