Merge remote-tracking branch 'origin/dev' into dev

zhuo

2025-03-03 941cc225c9c1f840aa1ddbeb2e999ba0ccc9c71d

Merge remote-tracking branch 'origin/dev' into dev

 cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java

@@ -134,12 +134,6 @@
        }
    }

    @ApiOperation(value = "获取设备负责人")
    @GetMapping("/selectDevicePrincipal")
    public Result selectDevicePrincipal() {
        return Result.success(deviceService.selectDevicePrincipal());
    }

    @ApiOperation(value = "通过项目获取设备列表")
    @GetMapping("/selectDeviceByCategory")
    public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass,String laboratory) {

 cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMapper.java

@@ -29,9 +29,6 @@
    //获取图片数据
    void selectDeviceImage(@Param(value = "name") String name ,@Param(value = "id") Integer id);

    //查询设备负责人
    List<Device> selectDevicePrincipal();

    IPage<DeviceDto> selectDeviceParameterPage(Page page, @Param("ew") QueryWrapper<DeviceDto> queryWrappers, @Param("laboratoryNameIsNull") Boolean laboratoryNameIsNull);

    List<Map<String, Object>> getInspectionItemSubclass(@Param("id") Integer id);

 cnas-device/src/main/java/com/ruoyi/device/service/DeviceService.java

@@ -34,8 +34,6 @@

    List<Device> search(Integer status, String deviceName, String specificationModel, String largeCategory);

    List<Device> selectDevicePrincipal();

    List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass,String laboratory);

    DeviceDto selectDeviceByCode(Integer id);

 cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java

@@ -117,11 +117,6 @@
    }

    @Override
    public List<Device> selectDevicePrincipal() {
        return deviceMapper.selectDevicePrincipal();
    }

    @Override
    public List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass, String laboratory) {
        List<Integer> id;


 cnas-device/src/main/resources/mapper/DeviceMapper.xml

@@ -89,11 +89,6 @@
             , #{createUser}
             , #{createTime})
    </select>
    <select id="selectDevicePrincipal" resultType="com.ruoyi.device.pojo.Device">
        select id,
               equipment_manager
        from device
    </select>

    <select id="selectDeviceParameterPage" resultType="com.ruoyi.device.pojo.Device">
        select * from(

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -58,6 +58,9 @@
    /** 签名地址 */
    private String signatureUrl;

    /** 个人照片地址 */
    private String pictureUrl;

    /** 单位id */
    private String company;

@@ -326,6 +329,16 @@
        this.signatureUrl = signatureUrl;
    }

    public String getPictureUrl()
    {
        return pictureUrl;
    }

    public void setPictureUrl(String pictureUrl)
    {
        this.pictureUrl = pictureUrl;
    }

    public String getCompany()
    {
        return company;

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -25,6 +25,7 @@
        <result property="remark"       column="remark"       />
        <result property="nameEn"       column="name_en"       />
        <result property="signatureUrl"       column="signature_url"       />
        <result property="pictureUrl"       column="picture_url"       />
        <result property="company"       column="company"       />
        <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
        <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
@@ -204,6 +205,7 @@
             <if test="remark != null">remark = #{remark},</if>
            <if test="nameEn != null and nameEn != ''">name_en = #{nameEn},</if>
            <if test="signatureUrl != null and signatureUrl != ''">signature_url = #{signatureUrl},</if>
            <if test="pictureUrl != null and pictureUrl != ''">picture_url = #{pictureUrl},</if>
            <if test="company != null and company != ''">company = #{company},</if>
             update_time = sysdate()
         </set>