Skip to content

C
clx-performance
提交 59e6ff79 authored 作者: 艾庆国's avatar 艾庆国
浏览文件
操作

承运优化需求

上级 df9e963d
隐藏空白字符变更
内嵌 并排
正在显示 包含 27 行增加 和 405 行删除
performance-api/src/main/java/com/clx/performance/vo/pc/OrderChildPoundAuditDetailVO.java
浏览文件 @ 59e6ff79
......@@ -82,4 +82,10 @@ public class OrderChildPoundAuditDetailVO {
@ApiModelProperty(value = "卸车识别皮重参考")
private BigDecimal unloadTareWeight;
@ApiModelProperty("合作公司id")
private Integer cooperativeCompaniesId;
@ApiModelProperty("合作公司名称")
private String cooperativeCompaniesName;
}
\ No newline at end of file
performance-web/src/main/java/com/clx/performance/controller/pc/export/TemplateController.java
浏览文件 @ 59e6ff79
......@@ -41,63 +41,55 @@ public class TemplateController {
}
@PostMapping("/saveTemplate")
@ApiOperation(value = "新增模板", notes = "<br>by wanglq")
@ApiOperation(value = "新增模板", notes = "<br>by 艾庆国")
public Result<Integer> saveTemplate(@Validated @RequestBody SaveExportTemplateParam param) {
return Result.ok(exportFieldService.saveTemplate(param));
}
@DeleteMapping("/deleteTemplate")
@ApiOperation(value = "删除模板", notes = "<br>by wanglq")
@ApiOperation(value = "删除模板", notes = "<br>by 艾庆国")
public Result<Void> deleteTemplate(@ApiParam("模板id") @RequestParam("id") Integer id) {
exportFieldService.deleteTemplate(id);
return Result.ok();
}
@PostMapping("/updateTemplateName")
@ApiOperation(value = "修改模板名称", notes = "<br>by wanglq")
@ApiOperation(value = "修改模板名称", notes = "<br>by 艾庆国")
public Result<Void> updateTemplateName(@Validated @RequestBody UpdateTemplateNameParam param) {
exportFieldService.updateTemplateName(param.getId(), param.getName());
return Result.ok();
}
@PostMapping("/updateTemplateDefaultFlag")
@ApiOperation(value = "设置默认模板", notes = "<br>by wanglq")
@ApiOperation(value = "设置默认模板", notes = "<br>by 艾庆国")
public Result<Integer> updateTemplateDefaultFlag(@Validated @RequestBody UpdateTemplateDefaultFlagParam param) {
exportFieldService.updateTemplateDefaultFlag(param.getId());
return Result.ok();
}
@PostMapping("/updateTemplateFields")
@ApiOperation(value = "修改模板下的字段列表", notes = "<br>by wanglq")
@ApiOperation(value = "修改模板下的字段列表", notes = "<br>by 艾庆国")
public Result<Integer> updateTemplateFields(@Validated @RequestBody UpdateTemplateFieldsParam param) {
exportFieldService.updateTemplateFields(param.getId(), param.getFieldIds());
return Result.ok();
}
@GetMapping("/getTemplateDetail")
@ApiOperation(value = "获取模板详情", notes = "<br>by wanglq")
@ApiOperation(value = "获取模板详情", notes = "<br>by 艾庆国")
public Result<ExportTemplateDetailVo> getTemplateDetail(@ApiParam("模板id") Integer id) {
return Result.ok(exportFieldService.getTemplateDetail(id).orNull());
}
@GetMapping("/listFieldByTemplate")
@ApiOperation(value = "查询模板下的所有字段", notes = "<br>by wanglq")
public Result<List<ExportFieldVo>> listFieldByTemplate(@ApiParam("模板id") @RequestParam Integer id,
@ApiParam("date") @RequestParam(required = false) String date) {
return Result.ok(exportFieldService.listFieldByTemplateAndDate(id, date));
@ApiOperation(value = "查询模板下的所有字段", notes = "<br>by 艾庆国")
public Result<List<ExportFieldVo>> listFieldByTemplate(@ApiParam("模板id") @RequestParam Integer id) {
return Result.ok(exportFieldService.listFieldByTemplate(id));
}
@GetMapping("/listFieldByTemplateAndDate")
@ApiOperation(value = "查询某天模板下的所有字段", notes = "<br>by wanglq")
public Result<List<ExportFieldVo>> listFieldByTemplateAndDate(@ApiParam("模板id") @RequestParam Integer id,
@RequestParam String date) {
return Result.ok(exportFieldService.listFieldByTemplateAndDate(id, date));
}
@GetMapping("/listFieldByFunctionCode")
@ApiOperation(value = "查询功能下的所有字段", notes = "<br>by wanglq")
public Result<List<ExportFieldVo>> listFieldByFunctionCode(@ApiParam("功能code") String functionCode,
String date) {
return Result.ok(exportFieldService.listFieldByFunctionCodeWithBase(functionCode, date));
@ApiOperation(value = "查询功能下的所有字段", notes = "<br>by 艾庆国")
public Result<List<ExportFieldVo>> listFieldByFunctionCode(@ApiParam("功能code") String functionCode) {
return Result.ok(exportFieldService.listFieldByFunctionCode(functionCode));
}
}
performance-web/src/main/java/com/clx/performance/dao/export/ExportFunctionDao.java deleted 100644 → 0
浏览文件 @ df9e963d
package com.clx.performance.dao.export;
import com.clx.performance.mapper.export.ExportFunctionMapper;
import com.clx.performance.model.export.ExportFunction;
import com.msl.common.dao.BaseDao;
public interface ExportFunctionDao extends BaseDao<ExportFunctionMapper, ExportFunction, Integer> {
}
performance-web/src/main/java/com/clx/performance/dao/export/ExtendExportFieldDao.java deleted 100644 → 0
浏览文件 @ df9e963d
package com.clx.performance.dao.export;
import com.clx.performance.mapper.export.ExtendExportFieldMapper;
import com.clx.performance.model.export.ExtendExportField;
import com.msl.common.dao.BaseDao;
import java.util.List;
public interface ExtendExportFieldDao extends BaseDao<ExtendExportFieldMapper, ExtendExportField, Integer> {
List<ExtendExportField> listFieldByFunctionCode(String code, Long companyNo, String date);
void delete(String code, Long operateCompanyNo, String date);
}
performance-web/src/main/java/com/clx/performance/dao/impl/export/ExportFunctionDaoImpl.java deleted 100644 → 0
浏览文件 @ df9e963d
package com.clx.performance.dao.impl.export;
import com.clx.performance.dao.export.ExportFunctionDao;
import com.clx.performance.mapper.export.ExportFunctionMapper;
import com.clx.performance.model.export.ExportFunction;
import com.msl.common.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Repository;
@Repository
public class ExportFunctionDaoImpl extends BaseDaoImpl<ExportFunctionMapper, ExportFunction, Integer> implements ExportFunctionDao {
}
performance-web/src/main/java/com/clx/performance/dao/impl/export/ExtendExportFieldDaoImpl.java deleted 100644 → 0
浏览文件 @ df9e963d
package com.clx.performance.dao.impl.export;
import com.clx.performance.dao.export.ExtendExportFieldDao;
import com.clx.performance.mapper.export.ExtendExportFieldMapper;
import com.clx.performance.model.export.ExtendExportField;
import com.msl.common.base.Optional;
import com.msl.common.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Repository;
import java.util.Collections;
import java.util.List;
@Repository
public class ExtendExportFieldDaoImpl extends BaseDaoImpl<ExtendExportFieldMapper, ExtendExportField, Integer> implements ExtendExportFieldDao {
/**
* 根据功能code查询字段
*
* @param code 功能code
* @param companyNo companyNo
* @return List
*/
@Override
public List<ExtendExportField> listFieldByFunctionCode(String code, Long companyNo, String date) {
return Optional.ofBlank(code)
.map(c -> list(lQrWrapper().eq(ExtendExportField::getExportFunctionCode, c)
.eq(ExtendExportField::getCompanyNo, companyNo)
.eq(ExtendExportField::getDate, date)
.orderByAsc(ExtendExportField::getSort))).orElse(Collections.emptyList());
}
/**
* 删除
*
* @param code code
* @param operateCompanyNo operateCompanyNo
*/
@Override
public void delete(String code, Long operateCompanyNo, String date) {
Optional.ofBlank(code)
.peek(
c -> baseMapper.delete(lQrWrapper().eq(ExtendExportField::getExportFunctionCode, code)
.eq(ExtendExportField::getDate, date)
.eq(ExtendExportField::getCompanyNo, operateCompanyNo))
);
}
}
performance-web/src/main/java/com/clx/performance/mapper/export/ExportFunctionMapper.java deleted 100644 → 0
浏览文件 @ df9e963d
package com.clx.performance.mapper.export;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.clx.performance.model.export.ExportFunction;
public interface ExportFunctionMapper extends BaseMapper<ExportFunction> {
}
performance-web/src/main/java/com/clx/performance/mapper/export/ExtendExportFieldMapper.java deleted 100644 → 0
浏览文件 @ df9e963d
package com.clx.performance.mapper.export;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.clx.performance.model.export.ExtendExportField;
public interface ExtendExportFieldMapper extends BaseMapper<ExtendExportField> {
}
performance-web/src/main/java/com/clx/performance/model/export/ExportFunction.java deleted 100644 → 0
浏览文件 @ df9e963d
package com.clx.performance.model.export;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.msl.common.config.KeyColumn;
import com.msl.common.model.HasKey;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
@Getter
@Setter
@Accessors(chain = true)
@TableName("export_function")
public class ExportFunction implements HasKey<Integer> {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableField("user_no")
@ApiModelProperty("用户编码")
private Long userNo;
@TableField("company_no")
@ApiModelProperty("公司编码")
private Long companyNo;
@TableField("code")
@ApiModelProperty("功能code")
private String code;
@TableField("name")
@ApiModelProperty("功能名称")
private String name;
@TableField("remark")
@ApiModelProperty("功能描述")
private String remark;
@Override
@KeyColumn("id")
public Integer gainKey() {
return this.id;
}
}
performance-web/src/main/java/com/clx/performance/model/export/ExtendExportField.java deleted 100644 → 0
浏览文件 @ df9e963d
package com.clx.performance.model.export;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.msl.common.config.KeyColumn;
import com.msl.common.model.HasKey;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.time.LocalDate;
@Getter
@Setter
@Accessors(chain = true)
@TableName("extend_export_field")
public class ExtendExportField implements HasKey<Integer> {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableField("date")
@ApiModelProperty("日期")
private LocalDate date;
@TableField("user_no")
@ApiModelProperty("用户编码")
private Long userNo;
@TableField("company_no")
@ApiModelProperty("公司编码")
private Long companyNo;
@TableField("export_function_code")
@ApiModelProperty("功能code")
private String exportFunctionCode;
@TableField("name")
@ApiModelProperty("字段名称")
private String name;
@TableField("code")
@ApiModelProperty("字段code,用于映射真实数据字段")
private String code;
@TableField("required")
@ApiModelProperty("是否必填：1是，0否")
private Integer required;
@TableField("sort")
@ApiModelProperty("排序字段")
private Integer sort;
@TableField("remark")
@ApiModelProperty("字段描述")
private String remark;
@Override
@KeyColumn("id")
public Integer gainKey() {
return this.id;
}
}
performance-web/src/main/java/com/clx/performance/service/export/ExportFieldService.java
浏览文件 @ 59e6ff79
......@@ -11,98 +11,24 @@ import java.util.List;
public interface ExportFieldService {
/**
* 查询用户某功能下的模板列表
*
* @param functionCode 功能code
* @return 模板列表
*/
List<ExportTemplateVo> listUserFunctionTemplate(String functionCode);
/**
* 查询用户某些功能下的模板列表
*
* @param userNo 用户编码
* @param functionCodes 功能code集合
* @return 模板列表
*/
List<ExportTemplateVo> listUserFunctionsTemplate(List<String> functionCodes);
/**
* 根据id获取模板详情
*
* @param id 模板id
* @return 模板详情
*/
Optional<ExportTemplateDetailVo> getTemplateDetail(Integer id);
/**
* 查询模板下的所有字段
*
* @param templateId 模板id
* @return 模板字段列表
*/
List<ExportFieldVo> listFieldByTemplate(Integer templateId);
/**
* 查询模板下的所有字段
*
* @param templateId 模板id
* @return 模板字段列表
*/
List<ExportFieldVo> listFieldByTemplateAndDate(Integer templateId, String date);
/**
* 新增模板
*
* @param param 模板参数
* @return 模板id
*/
Integer saveTemplate(SaveExportTemplateParam param);
/**
* 删除模板
*
* @param id 模板id
*/
void deleteTemplate(Integer id);
/**
* 修改模板名称
*
* @param templateId 模板id
* @param name 模板名称
*/
void updateTemplateName(Integer templateId, String name);
/**
* 设置默认模板
*
* @param templateId 模板id
*/
void updateTemplateDefaultFlag(Integer templateId);
/**
* 修改模板的字段列表
*
* @param id 模板id
* @param fieldIds 字段列表
*/
void updateTemplateFields(Integer id, List<Integer> fieldIds);
/**
* 查询功能下的所有字段
*
* @param functionCode 功能code
* @return 字段列表
*/
List<ExportFieldVo> listFieldByFunctionCode(String functionCode);
/**
* 查询功能下的所有字段
*
* @param functionCode 功能code
* @return 字段列表
*/
List<ExportFieldVo> listFieldByFunctionCodeWithBase(String functionCode, String date);
}
performance-web/src/main/java/com/clx/performance/service/export/ExportFunctionService.java deleted 100644 → 0
浏览文件 @ df9e963d
package com.clx.performance.service.export;
public interface ExportFunctionService {
}
performance-web/src/main/java/com/clx/performance/service/export/ExtendExportFieldService.java deleted 100644 → 0
浏览文件 @ df9e963d
package com.clx.performance.service.export;
import com.clx.performance.model.export.ExtendExportField;
import java.util.List;
public interface ExtendExportFieldService {
/**
* 根据功能code查询字段
*
* @param code 功能code
* @param companyNo companyNo
* @return List
*/
List<ExtendExportField> listFieldByFunctionCode(String code, Long companyNo, String date);
// /**
// * 设置基准的模板
// *
// * @param baseList baseList
// */
// void setBase(List<CoalBlendingBase> baseList, BlendingBaseParam param);
}
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundAuditServiceImpl.java
浏览文件 @ 59e6ff79
......@@ -2,10 +2,12 @@ package com.clx.performance.service.impl;
import com.alibaba.druid.sql.visitor.functions.If;
import com.clx.order.enums.QuotationEnum;
import com.clx.order.vo.feign.FeignOrderInfoVO;
import com.clx.performance.dao.*;
import com.clx.performance.dto.payment.PaymentDTO;
import com.clx.performance.enums.*;
import com.clx.performance.enums.settle.SettlementWayEnum;
import com.clx.performance.extranal.user.OrderService;
import com.clx.performance.model.*;
import com.clx.performance.param.pc.PoundAuditParam;
import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
......@@ -60,6 +62,7 @@ public class OrderChildPoundAuditServiceImpl implements OrderChildPoundAuditSer
private final PaymentService paymentService;
private final OcrRecognitionDao ocrRecognitionDao;
private final OrderChildPostService orderChildPostService;
private final OrderService orderService;
@Override
public OrderChildPoundAuditDetailVO getPoundAuditDetail(String childNo) {
......@@ -93,6 +96,11 @@ public class OrderChildPoundAuditServiceImpl implements OrderChildPoundAuditSer
vo.setUnloadGrossWeight(imageTypeOcrRecognitionMap.getOrDefault(OrderChildImage.Type.UNLOAD.getCode(),new OcrRecognition()).getGrossWeight());
vo.setUnloadTareWeight(imageTypeOcrRecognitionMap.getOrDefault(OrderChildImage.Type.UNLOAD.getCode(),new OcrRecognition()).getTareWeight());
// 合作公司
FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderChild.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);
vo.setCooperativeCompaniesId(orderInfo.getCooperativeCompaniesId());
vo.setCooperativeCompaniesName(orderInfo.getCooperativeCompaniesName());
return vo;
}
......
performance-web/src/main/java/com/clx/performance/service/impl/export/ExportFieldServiceImpl.java
浏览文件 @ 59e6ff79
......@@ -72,13 +72,6 @@ public class ExportFieldServiceImpl implements ExportFieldService {
return list;
}
@Override
public List<ExportFieldVo> listFieldByTemplateAndDate(Integer templateId, String date) {
List<ExportFieldVo> list = exportFieldStruct.convert(exportFieldDao.listFieldByTemplate(templateId));
return list;
}
@Override
public Integer saveTemplate(SaveExportTemplateParam param) {
......@@ -186,11 +179,4 @@ public class ExportFieldServiceImpl implements ExportFieldService {
return exportFieldStruct.convert(exportFieldDao.listFieldByFunctionCode(functionCode));
}
@Override
public List<ExportFieldVo> listFieldByFunctionCodeWithBase(String functionCode, String date) {
List<ExportFieldVo> list = exportFieldStruct.convert(exportFieldDao.listFieldByFunctionCode(functionCode));
return list;
}
}
performance-web/src/main/java/com/clx/performance/service/impl/export/ExportFunctionServiceImpl.java deleted 100644 → 0
浏览文件 @ df9e963d
package com.clx.performance.service.impl.export;
import com.clx.performance.service.export.ExportFunctionService;
import org.springframework.stereotype.Service;
@Service
public class ExportFunctionServiceImpl implements ExportFunctionService {
}
performance-web/src/main/java/com/clx/performance/service/impl/export/ExtendExportFieldServiceImpl.java deleted 100644 → 0
浏览文件 @ df9e963d
package com.clx.performance.service.impl.export;
import com.clx.performance.model.export.ExtendExportField;
import com.clx.performance.service.export.ExtendExportFieldService;
import com.clx.performance.struct.export.ExportFieldStruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class ExtendExportFieldServiceImpl implements ExtendExportFieldService {
@Autowired
private ExportFieldStruct exportFieldStruct;
/**
* 根据功能code查询字段
*
* @param code 功能code
* @param companyNo companyNo
* @return List
*/
@Override
public List<ExtendExportField> listFieldByFunctionCode(String code, Long companyNo, String date) {
return null;
}
}
performance-web/src/main/java/com/clx/performance/struct/export/ExportFieldStruct.java
浏览文件 @ 59e6ff79
package com.clx.performance.struct.export;
import com.clx.performance.model.export.ExportField;
import com.clx.performance.model.export.ExtendExportField;
import com.clx.performance.vo.pc.export.ExportFieldVo;
import com.msl.common.utils.DateUtils;
import org.mapstruct.IterableMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Named;
import java.util.List;
//@Mapper(componentModel = "spring", imports = {DateUtils.class, BlendingBaseParam.class, FunctionCodeEnum.class, WhetherEnum.class})
@Mapper(componentModel = "spring", imports = {DateUtils.class})
public interface ExportFieldStruct {
ExportFieldVo convert(ExportField field);
@Named("convertExtend")
ExportFieldVo convertExtend(ExtendExportField field);
List<ExportFieldVo> convert(List<ExportField> fields);
@IterableMapping(qualifiedByName = "convertExtend")
List<ExportFieldVo> convertExtendList(List<ExtendExportField> fields);
// List<ExtendExportField> convertToFieldList(List<CoalBlendingBase> baseList, @Context BlendingBaseParam param);
//
// @Mapping(target = "exportFunctionCode", expression = "java(FunctionCodeEnum.COAL_BLENDING.getCode())")
// @Mapping(target = "code", source = "base.baseId")
// @Mapping(target = "sort", expression = "java(base.getId() - Integer.MAX_VALUE)")
// @Mapping(target = "name", source = "base.name")
// @Mapping(target = "date", expression = "java(DateUtils.parseDate(param.getDate()).orNull())")
// @Mapping(target = "userNo", expression = "java(param.getOperateUserNo())")
// @Mapping(target = "companyNo", expression = "java(param.getOperateCompanyNo())")
// @Mapping(target = "required", expression = "java(WhetherEnum.TRUE.getCode())")
// ExtendExportField convertToField(CoalBlendingBase base, @Context BlendingBaseParam param);
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论