From 34db62ba2f1bff9a81fe26050d8bc6ecf483daae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 29 Jan 2026 11:25:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-1286=20=E8=AE=BE=E5=A4=87=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E5=85=AC=E5=8F=B8=E8=BD=AC=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/DeviceController.java | 32 +++++ .../query/ChangeServiceAgentCodeQuery.java | 22 ++++ .../admin/pojo/query/DeviceQuery.java | 8 +- .../gongfu/controller/DeviceController.java | 32 +++++ .../query/ChangeServiceAgentCodeQuery.java | 22 ++++ .../gongfu/pojo/query/DeviceQuery.java | 8 +- .../repository/entity/Device.java | 10 ++ .../repository/entity/DeviceAgentRecord.java | 57 +++++++++ .../repository/entity/GongfuDevice.java | 10 ++ .../entity/GongfuDeviceAgentRecord.java | 57 +++++++++ .../mapper/DeviceAgentRecordMapper.java | 16 +++ .../mapper/GongfuDeviceAgentRecordMapper.java | 16 +++ .../service/IDeviceAgentRecordService.java | 16 +++ .../IGongfuDeviceAgentRecordService.java | 16 +++ .../impl/DeviceAgentRecordServiceImpl.java | 20 +++ .../GongfuDeviceAgentRecordServiceImpl.java | 20 +++ .../mapper/DeviceAgentRecordMapper.xml | 5 + .../main/resources/mapper/DeviceMapper.xml | 16 ++- .../mapper/GongfuDeviceAgentRecordMapper.xml | 5 + .../resources/mapper/GongfuDeviceMapper.xml | 15 ++- .../repository/CodeGeneratorTest.java | 2 +- .../starter/advice/LoggingAspect.java | 120 ------------------ 22 files changed, 390 insertions(+), 135 deletions(-) create mode 100644 nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/ChangeServiceAgentCodeQuery.java create mode 100644 nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/query/ChangeServiceAgentCodeQuery.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DeviceAgentRecord.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/GongfuDeviceAgentRecord.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceAgentRecordMapper.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/GongfuDeviceAgentRecordMapper.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceAgentRecordService.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IGongfuDeviceAgentRecordService.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceAgentRecordServiceImpl.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuDeviceAgentRecordServiceImpl.java create mode 100644 nflg-mobilebroken-repository/src/main/resources/mapper/DeviceAgentRecordMapper.xml create mode 100644 nflg-mobilebroken-repository/src/main/resources/mapper/GongfuDeviceAgentRecordMapper.xml delete mode 100644 nflg-mobilebroken-starter/src/main/java/com/nflg/mobilebroken/starter/advice/LoggingAspect.java diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java index 6e244ed6..d3e866bb 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java @@ -12,6 +12,7 @@ import com.nflg.mobilebroken.admin.pojo.dto.DeviceAddImportDTO; import com.nflg.mobilebroken.admin.pojo.dto.DeviceDTO; import com.nflg.mobilebroken.admin.pojo.dto.DeviceUpdateImportDTO; import com.nflg.mobilebroken.admin.pojo.dto.SyncFromCrmDTO; +import com.nflg.mobilebroken.admin.pojo.query.ChangeServiceAgentCodeQuery; import com.nflg.mobilebroken.admin.pojo.query.DeviceQuery; import com.nflg.mobilebroken.admin.pojo.vo.DeviceDetailResultVO; import com.nflg.mobilebroken.admin.service.AdminDeviceService; @@ -93,6 +94,9 @@ public class DeviceController extends ControllerBase { @Resource private DeviceQRCodeService deviceQRCodeService; + @Resource + private IDeviceAgentRecordService deviceAgentRecordService; + /** * 获取设备列表 @@ -771,4 +775,32 @@ public class DeviceController extends ControllerBase { } return ResponseEntity.ok().build(); } + + /** + * 修改服务代理商公司 + */ + @Transactional + @PostMapping("changeServiceAgentCode") + public ApiResult changeServiceAgentCode(@RequestBody ChangeServiceAgentCodeQuery query) { + TBaseCustomer customer = customerService.lambdaQuery() + .eq(TBaseCustomer::getDelIs, 0) + .eq(TBaseCustomer::getEnableState, 1) + .eq(TBaseCustomer::getAgencyCompanyCode, query.getServiceAgentCode()) + .one(); + VUtils.trueThrowBusinessError(Objects.isNull(customer)).throwMessage("代理商公司不存在"); + deviceService.lambdaUpdate() + .set(Device::getServiceAgentCode, query.getServiceAgentCode()) + .set(Device::getServiceAgentName, customer.getAgencyCompanyName()) + .eq(Device::getId, query.getDeviceId()) + .update(); + deviceAgentRecordService.save(new DeviceAgentRecord() + .setDeviceId(query.getDeviceId()) + .setAgentCode(query.getServiceAgentCode()) + .setAgentName(customer.getAgencyCompanyName()) + .setCreateById(AdminUserUtil.getUserId()) + .setCreateBy(AdminUserUtil.getUserName()) + .setCreateTime(LocalDateTime.now()) + ); + return ApiResult.success(); + } } diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/ChangeServiceAgentCodeQuery.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/ChangeServiceAgentCodeQuery.java new file mode 100644 index 00000000..5f4e909a --- /dev/null +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/ChangeServiceAgentCodeQuery.java @@ -0,0 +1,22 @@ +package com.nflg.mobilebroken.admin.pojo.query; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Data +public class ChangeServiceAgentCodeQuery { + + /** + * 设备ID + */ + @NotNull + private Integer deviceId; + + /** + * 服务代理商编码 + */ + @NotBlank + private String serviceAgentCode; +} diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceQuery.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceQuery.java index 487a821d..3f723c40 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceQuery.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/DeviceQuery.java @@ -15,11 +15,17 @@ public class DeviceQuery extends PageBaseQuery { * 客户名称 */ private String customerName; + /** - * 代理商 + * 所属代理商 */ private String agentName; + /** + * 服务代理商 + */ + private String serviceAgentName; + /** * 设备机型 */ diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java index 206886db..415b0046 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/DeviceController.java @@ -20,6 +20,7 @@ import com.nflg.mobilebroken.gongfu.pojo.dto.DeviceAddImportDTO; import com.nflg.mobilebroken.gongfu.pojo.dto.DeviceDTO; import com.nflg.mobilebroken.gongfu.pojo.dto.DeviceUpdateImportDTO; import com.nflg.mobilebroken.gongfu.pojo.dto.SyncFromCrmDTO; +import com.nflg.mobilebroken.gongfu.pojo.query.ChangeServiceAgentCodeQuery; import com.nflg.mobilebroken.gongfu.pojo.query.DeviceQuery; import com.nflg.mobilebroken.gongfu.pojo.vo.DeviceDetailResultVO; import com.nflg.mobilebroken.gongfu.service.AdminDeviceService; @@ -94,6 +95,9 @@ public class DeviceController extends ControllerBase { @Resource private DeviceQRCodeService deviceQRCodeService; + @Resource + private IGongfuDeviceAgentRecordService gongfuDeviceAgentRecordService; + /** * 获取产品线列表 * @return 产品线列表 @@ -811,4 +815,32 @@ public class DeviceController extends ControllerBase { } return ResponseEntity.ok().build(); } + + /** + * 修改服务代理商公司 + */ + @Transactional + @PostMapping("changeServiceAgentCode") + public ApiResult changeServiceAgentCode(@RequestBody ChangeServiceAgentCodeQuery query) { + TBaseCustomer customer = customerService.lambdaQuery() + .eq(TBaseCustomer::getDelIs, 0) + .eq(TBaseCustomer::getEnableState, 1) + .eq(TBaseCustomer::getAgencyCompanyCode, query.getServiceAgentCode()) + .one(); + VUtils.trueThrowBusinessError(Objects.isNull(customer)).throwMessage("代理商公司不存在"); + deviceService.lambdaUpdate() + .set(GongfuDevice::getServiceAgentCode, query.getServiceAgentCode()) + .set(GongfuDevice::getServiceAgentName, customer.getAgencyCompanyName()) + .eq(GongfuDevice::getId, query.getDeviceId()) + .update(); + gongfuDeviceAgentRecordService.save(new GongfuDeviceAgentRecord() + .setDeviceId(query.getDeviceId()) + .setAgentCode(query.getServiceAgentCode()) + .setAgentName(customer.getAgencyCompanyName()) + .setCreateById(AdminUserUtil.getUserId()) + .setCreateBy(AdminUserUtil.getUserName()) + .setCreateTime(LocalDateTime.now()) + ); + return ApiResult.success(); + } } diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/query/ChangeServiceAgentCodeQuery.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/query/ChangeServiceAgentCodeQuery.java new file mode 100644 index 00000000..254e24eb --- /dev/null +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/query/ChangeServiceAgentCodeQuery.java @@ -0,0 +1,22 @@ +package com.nflg.mobilebroken.gongfu.pojo.query; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Data +public class ChangeServiceAgentCodeQuery { + + /** + * 设备ID + */ + @NotNull + private Long deviceId; + + /** + * 服务代理商编码 + */ + @NotBlank + private String serviceAgentCode; +} diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/query/DeviceQuery.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/query/DeviceQuery.java index 37020c79..f4af4e3e 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/query/DeviceQuery.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/query/DeviceQuery.java @@ -15,11 +15,17 @@ public class DeviceQuery extends PageBaseQuery { * 客户名称 */ private String customerName; + /** - * 代理商 + * 所属代理商 */ private String agentName; + /** + * 服务代理商 + */ + private String serviceAgentName; + /** * 设备机型 */ diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java index 44b8e17b..b1fad3a8 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/Device.java @@ -78,6 +78,16 @@ public class Device implements Serializable { */ private String agentName; + /** + * 服务代理商编码 + */ + private String serviceAgentCode; + + /** + * 服务代理商名称 + */ + private String serviceAgentName; + /** * 区域编码 */ diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DeviceAgentRecord.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DeviceAgentRecord.java new file mode 100644 index 00000000..7f3c5f4c --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DeviceAgentRecord.java @@ -0,0 +1,57 @@ +package com.nflg.mobilebroken.repository.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("device_agent_record") +public class DeviceAgentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 设备id + */ + private Integer deviceId; + + /** + * 公司编码 + */ + private String agentCode; + + /** + * 公司名称 + */ + private String agentName; + + /** + * 创建人id + */ + private Integer createById; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private LocalDateTime createTime; +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/GongfuDevice.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/GongfuDevice.java index 1e82d395..d432a1bc 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/GongfuDevice.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/GongfuDevice.java @@ -79,6 +79,16 @@ public class GongfuDevice implements Serializable { */ private String agentName; + /** + * 服务代理商编码 + */ + private String serviceAgentCode; + + /** + * 服务代理商名称 + */ + private String serviceAgentName; + /** * 区域编码 */ diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/GongfuDeviceAgentRecord.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/GongfuDeviceAgentRecord.java new file mode 100644 index 00000000..be7c3522 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/GongfuDeviceAgentRecord.java @@ -0,0 +1,57 @@ +package com.nflg.mobilebroken.repository.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("gongfu_device_agent_record") +public class GongfuDeviceAgentRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + /** + * 设备id + */ + private Long deviceId; + + /** + * 公司编码 + */ + private String agentCode; + + /** + * 公司名称 + */ + private String agentName; + + /** + * 创建人id + */ + private Integer createById; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private LocalDateTime createTime; +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceAgentRecordMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceAgentRecordMapper.java new file mode 100644 index 00000000..66c07ee3 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DeviceAgentRecordMapper.java @@ -0,0 +1,16 @@ +package com.nflg.mobilebroken.repository.mapper; + +import com.nflg.mobilebroken.repository.entity.DeviceAgentRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface DeviceAgentRecordMapper extends BaseMapper { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/GongfuDeviceAgentRecordMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/GongfuDeviceAgentRecordMapper.java new file mode 100644 index 00000000..1270794f --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/GongfuDeviceAgentRecordMapper.java @@ -0,0 +1,16 @@ +package com.nflg.mobilebroken.repository.mapper; + +import com.nflg.mobilebroken.repository.entity.GongfuDeviceAgentRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface GongfuDeviceAgentRecordMapper extends BaseMapper { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceAgentRecordService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceAgentRecordService.java new file mode 100644 index 00000000..0ad8c66f --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDeviceAgentRecordService.java @@ -0,0 +1,16 @@ +package com.nflg.mobilebroken.repository.service; + +import com.nflg.mobilebroken.repository.entity.DeviceAgentRecord; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface IDeviceAgentRecordService extends IService { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IGongfuDeviceAgentRecordService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IGongfuDeviceAgentRecordService.java new file mode 100644 index 00000000..c506ce35 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IGongfuDeviceAgentRecordService.java @@ -0,0 +1,16 @@ +package com.nflg.mobilebroken.repository.service; + +import com.nflg.mobilebroken.repository.entity.GongfuDeviceAgentRecord; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +public interface IGongfuDeviceAgentRecordService extends IService { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceAgentRecordServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceAgentRecordServiceImpl.java new file mode 100644 index 00000000..fc993846 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DeviceAgentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.mobilebroken.repository.service.impl; + +import com.nflg.mobilebroken.repository.entity.DeviceAgentRecord; +import com.nflg.mobilebroken.repository.mapper.DeviceAgentRecordMapper; +import com.nflg.mobilebroken.repository.service.IDeviceAgentRecordService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Service +public class DeviceAgentRecordServiceImpl extends ServiceImpl implements IDeviceAgentRecordService { + +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuDeviceAgentRecordServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuDeviceAgentRecordServiceImpl.java new file mode 100644 index 00000000..90fa08a7 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuDeviceAgentRecordServiceImpl.java @@ -0,0 +1,20 @@ +package com.nflg.mobilebroken.repository.service.impl; + +import com.nflg.mobilebroken.repository.entity.GongfuDeviceAgentRecord; +import com.nflg.mobilebroken.repository.mapper.GongfuDeviceAgentRecordMapper; +import com.nflg.mobilebroken.repository.service.IGongfuDeviceAgentRecordService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2026 + */ +@Service +public class GongfuDeviceAgentRecordServiceImpl extends ServiceImpl implements IGongfuDeviceAgentRecordService { + +} diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceAgentRecordMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceAgentRecordMapper.xml new file mode 100644 index 00000000..7de47271 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceAgentRecordMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml index ae46e199..edcfd466 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml @@ -13,11 +13,12 @@ , d.warranty_month AS 'warrantyMonth' , d.customer_name AS 'customerName' - , d.agent_name + , d.service_agent_code as 'agent_code' + , d.service_agent_name as 'agent_name' ,c.area_name,d.type,d.address,d.product_line FROM v_all_device d - LEFT JOIN t_base_customer c ON c.agency_company_code=d.agent_code + LEFT JOIN t_base_customer c ON c.agency_company_code=d.service_agent_code WHERE d.device_no = #{deviceNo} ORDER BY d.data_valid_state DESC,d.device_state DESC LIMIT 1; @@ -32,6 +33,9 @@ and a.agent_name=#{query.agentName} + + and a.service_agent_name=#{query.serviceAgentName} + and a.model_no LIKE concat('%', #{query.modelNo}, '%') @@ -50,7 +54,7 @@ @@ -66,7 +70,7 @@ SELECT d.device_no,d.device_name,d.model_no,d.device_type,d.shipment_date,d.customer_name ,IFNULL(dit2.value,di2.value) AS 'warrantyState' FROM v_all_device d - INNER JOIN t_base_customer c ON d.agent_code=c.agency_company_code + INNER JOIN t_base_customer c ON d.service_agent_code=c.agency_company_code INNER JOIN dictionary_item di ON di.id=d.device_state LEFT JOIN dictionary_item di2 ON di2.id=d.warranty_state LEFT JOIN dictionary_item_translate dit2 ON dit2.dictionary_item_id=d.warranty_state AND dit2.language_code=#{language} @@ -133,9 +137,9 @@ - SELECT d.*, dc.id AS 'componentId',c.area_name + SELECT d.*, c.area_name FROM gongfu_device d LEFT JOIN gongfu_device_component dc ON d.model_no = dc.model_no AND dc.`enable` = 1 - LEFT JOIN t_base_customer c ON c.agency_company_code=d.agent_code + LEFT JOIN t_base_customer c ON c.agency_company_code=d.service_agent_code WHERE d.device_no = #{deviceNo} ORDER BY d.data_valid_state DESC,d.device_state DESC LIMIT 1; @@ -21,6 +21,9 @@ and a.agent_name=#{query.agentName} + + and a.service_agent_name=#{query.serviceAgentName} + and a.model_no LIKE concat('%', #{query.modelNo}, '%') @@ -39,7 +42,7 @@