代码优化

sop-api/src/main/java/com/qmth/sop/server/api/TBDeviceDeliveryController.java

@@ -63,7 +63,7 @@ public class TBDeviceDeliveryController {
                        @ApiParam(value = "签收开始时间") @RequestParam(required = false) Long receiveStartTime,
                        @ApiParam(value = "签收结束时间") @RequestParam(required = false) Long receiveEndTime,
                        @ApiParam(value = "页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-                       @ApiParam(value = "页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+                       @ApiParam(value = "页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) throws Exception {
         return ResultUtil.ok(tbDeviceDeliveryService.page(new Page<>(pageNumber, pageSize), serviceId, usageType, crmNo, status, deliverUserId, deliverStartTime, deliverEndTime, serialNo, supplierId, receiveStartTime, receiveEndTime));
     }
 

sop-business/src/main/java/com/qmth/sop/business/bean/result/TBDeviceDeliveryResult.java

@@ -17,6 +17,7 @@ import java.io.Serializable;
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class TBDeviceDeliveryResult implements Serializable {
+
     @ApiModelProperty("id")
     @ExcelIgnore
     private Long id;

sop-business/src/main/java/com/qmth/sop/business/mapper/TBDeviceDeliveryMapper.java

@@ -50,32 +50,4 @@ public interface TBDeviceDeliveryMapper extends BaseMapper<TBDeviceDelivery> {
                                        @Param("supplierId") Long supplierId,
                                        @Param("receiveStartTime") Long receiveStartTime,
                                        @Param("receiveEndTime") Long receiveEndTime);
-
-    /**
-     * 设备发货列表查询
-     *
-     * @param serviceId        serviceId
-     * @param usageType        usageType
-     * @param crmNo            crmNo
-     * @param status           status
-     * @param deliverUserId    deliverUserId
-     * @param deliverStartTime deliverStartTime
-     * @param deliverEndTime   deliverEndTime
-     * @param serialNo         serialNo
-     * @param supplierId       supplierId
-     * @param receiveStartTime receiveStartTime
-     * @param receiveEndTime   receiveEndTime
-     * @return 查询结果
-     */
-    List<TBDeviceDeliveryResult> list(@Param("serviceId") Long serviceId,
-                                      @Param("usageType") DeviceUsageTypeEnum usageType,
-                                      @Param("crmNo") String crmNo,
-                                      @Param("status") DeviceDeliveryStatusEnum status,
-                                      @Param("deliverUserId") Long deliverUserId,
-                                      @Param("deliverStartTime") Long deliverStartTime,
-                                      @Param("deliverEndTime") Long deliverEndTime,
-                                      @Param("serialNo") String serialNo,
-                                      @Param("supplierId") Long supplierId,
-                                      @Param("receiveStartTime") Long receiveStartTime,
-                                      @Param("receiveEndTime") Long receiveEndTime);
 }

sop-business/src/main/java/com/qmth/sop/business/service/TBDeviceDeliveryService.java

@@ -10,7 +10,6 @@ import com.qmth.sop.common.enums.DeviceUsageTypeEnum;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -37,7 +36,6 @@ public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
      */
     void editDeviceDelivery(DeviceDeliveryParam deviceDeliveryParam);
 
-
     /**
      * 设备发货管理查询
      *
@@ -56,22 +54,4 @@ public interface TBDeviceDeliveryService extends IService<TBDeviceDelivery> {
      * @return 分页结果
      */
     IPage<TBDeviceDeliveryResult> page(IPage<Map> iPage, Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception;
-
-    /**
-     * 设备发货管理列表
-     *
-     * @param serviceId         服务单元id
-     * @param usageType         用途类型
-     * @param crmNo             项目单号
-     * @param status            发货状态
-     * @param deliverUserId     发货人
-     * @param deliveryStartTime 发货开始时间
-     * @param deliveryEndTime   发货结束时间
-     * @param serialNo          设备序列号
-     * @param supplierId        供应商
-     * @param receiveStartTime  验收开始时间
-     * @param receiveEndTime    验收结束时间
-     * @return 分页结果
-     */
-    List<TBDeviceDeliveryResult> list(Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception;
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDeviceDeliveryServiceImpl.java

@@ -206,32 +206,6 @@ public class TBDeviceDeliveryServiceImpl extends ServiceImpl<TBDeviceDeliveryMap
         return page;
     }
 
-
-    @Override
-    public List<TBDeviceDeliveryResult> list(Long serviceId, DeviceUsageTypeEnum usageType, String crmNo, DeviceDeliveryStatusEnum status, Long deliverUserId, Long deliveryStartTime, Long deliveryEndTime, String serialNo, Long supplierId, Long receiveStartTime, Long receiveEndTime) throws Exception {
-        if (crmNo != null && crmNo.length() > 0) {
-            crmNo = SystemConstant.translateSpecificSign(crmNo);
-        }
-        if (serialNo != null && serialNo.length() > 0) {
-            serialNo = SystemConstant.translateSpecificSign(serialNo);
-        }
-        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        DataPermissionDto dpr = sysUserService.buildUserDataPermission(requestUser.getId());
-        if (dpr.getHasDeviceDelivery()) {
-            // 是设备管理员
-            Long userSupplierId = requestUser.getSupplierId();
-            if (userSupplierId == null || userSupplierId == 0) {
-                throw ExceptionResultEnum.ERROR.exception("请先在用户管理中绑定设备发货员对应的供应商");
-            }
-            supplierId = userSupplierId;
-        }
-        List<TBDeviceDeliveryResult> result = this.baseMapper.list(serviceId, usageType, crmNo, status, deliverUserId, deliveryStartTime, deliveryEndTime, serialNo, supplierId, receiveStartTime, receiveEndTime);
-        for (TBDeviceDeliveryResult e : result) {
-            this.fillResultInfo(e);
-        }
-        return result;
-    }
-
     /**
      * 补充结果信息
      *

sop-business/src/main/resources/mapper/TBDeviceDeliveryMapper.xml

@@ -72,74 +72,4 @@
             </if>
         </where>
     </select>
-    <select id="list" resultType="com.qmth.sop.business.bean.result.TBDeviceDeliveryResult">
-        SELECT
-            tbdd.id,
-            tbs.name AS serviceName,
-            tbdd.crm_no AS crmNo,
-            tbdd.usage_type AS usageType,
-            tbdd.delivery_type AS deliveryType,
-            ss.name AS supplierName,
-            sd.device_code AS deviceNo,
-            sd.serial_no AS serialNo,
-            sd.brand,
-            sd.model,
-            tbdd.mailing_address AS mailingAddress,
-            tbdd.consignee,
-            tbdd.consignee_phone AS consigneePhone,
-            tbdd.express_no AS expressNo,
-            tbdd.express_photo_path AS expressPhotoPath,
-            tbdd.status,
-            tbdd.deliver_time AS deliverTime,
-            su.real_name AS deliverUserName,
-            tbdd.receive_time AS receiveTime
-        FROM
-            t_b_device_delivery tbdd
-                LEFT JOIN
-            t_b_crm tbc ON tbc.crm_no = tbdd.crm_no
-                LEFT JOIN
-            t_b_service tbs ON tbc.service_id = tbs.id
-                LEFT JOIN
-            sys_supplier ss ON ss.id = tbdd.supplier_id
-                LEFT JOIN
-            sys_device sd ON sd.serial_no = tbdd.serial_no
-                LEFT JOIN
-            sys_user su ON su.id = tbdd.deliver_user_id
-        <where>
-            AND tbdd.enable = 1
-            <if test="serviceId != null and serviceId != ''">
-                AND tbdd.service_id = #{serviceId}
-            </if>
-            <if test="usageType != null and usageType != ''">
-                AND tbdd.usage_type = #{usageType}
-            </if>
-            <if test="crmNo != null and crmNo != ''">
-                AND tbdd.crm_no = #{crmNo}
-            </if>
-            <if test="status != null and status != ''">
-                AND tbdd.status = #{status}
-            </if>
-            <if test="deliverUserId != null">
-                AND tbdd.deliver_user_id = #{deliverUserId}
-            </if>
-            <if test="deliverStartTime != null">
-                AND tbdd.deliver_time <![CDATA[ >= ]]> #{deliverStartTime}
-            </if>
-            <if test="deliverEndTime != null">
-                AND tbdd.deliver_time <![CDATA[ <= ]]> #{deliverEndTime}
-            </if>
-            <if test="serialNo != null and serialNo != ''">
-                AND tbdd.serial_no = #{serialNo}
-            </if>
-            <if test="supplierId != null">
-                AND tbdd.supplier_id = #{supplierId}
-            </if>
-            <if test="receiveStartTime != null and receiveStartTime != ''">
-                AND tbdd.receive_time <![CDATA[ >= ]]> #{receiveStartTime}
-            </if>
-            <if test="receiveEndTime != null and receiveEndTime != ''">
-                AND tbdd.receive_time <![CDATA[ <= ]]> #{receiveEndTime}
-            </if>
-        </where>
-    </select>
 </mapper>