java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

1.干线bug修复

dist.1.3.0
zhenghaoyu 7 months ago
parent
6178a10f7a
commit
b9251b84e0
5 changed files with 134 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
  2. 2
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml
  3. 73
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
  4. 28
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
  5. 30
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

18
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
Unescape View File

@ -146,6 +146,11 @@ public class LoadCarsDTO implements Serializable {
private Integer unloadAbnormal;
private Integer isSupple;
private String arriveTimeStartStr;
private String arriveTimeEndStr;
private Date arriveTimeStart;
private Date arriveTimeEnd;
private String createTimeStartStr;
private String createTimeEndStr;
@ -161,4 +166,17 @@ public class LoadCarsDTO implements Serializable {
private String carsNo;
private String carrierTimeStartStr;
private String carrierTimeEndStr;
private Date carrierTimeStart;
private Date carrierTimeEnd;
private String signTimeStartStr;
private String signTimeEndStr;
private Date signTimeStart;
private Date signTimeEnd;
}

2
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalRecordMapper.xml
Unescape View File

@ -39,7 +39,7 @@
<if test="param.upUserName !=null and param.upUserName != ''">
and Locate(#{param.upUserName},up_user_name) > 0
</if>
<if test="param.abnormalStatus !=null and param.abnormalStatus != ''">
<if test="param.abnormalStatus !=null ">
and abnormal_status = #{param.abnormalStatus}
</if>
<if test="param.dealUserName !=null and param.dealUserName != ''">

73
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
Unescape View File

@ -54,6 +54,24 @@
<if test="param.warehouseName != null and param.warehouseName != ''">
and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_name) > 0)
</if>
<if test="param.createTimeStart != null ">
and ltcl.create_time &gt;= #{param.createTimeStart}
</if>
<if test="param.createTimeEnd != null ">
and ltcl.create_time &lt;= #{param.createTimeEnd}
</if>
<if test="param.startTime != null ">
and ltcl.start_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null ">
and ltcl.start_time &lt;= #{param.endTime}
</if>
<if test="param.arriveTimeStart != null ">
and ltcl.arrive_time &gt;= #{param.arriveTimeStart}
</if>
<if test="param.arriveTimeEnd != null ">
and ltcl.arrive_time &lt;= #{param.arriveTimeEnd}
</if>
group by ltcl.id,ltcl.cars_no,
ltcl.plan_loading_number,
ltcl.real_loading_number,
@ -120,6 +138,24 @@
<if test="param.loadCarsNo != null and param.loadCarsNo != ''">
and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0
</if>
<if test="param.createTimeStart != null ">
and ltcl.create_time &gt;= #{param.createTimeStart}
</if>
<if test="param.createTimeEnd != null ">
and ltcl.create_time &lt;= #{param.createTimeEnd}
</if>
<if test="param.startTime != null ">
and ltcl.start_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null ">
and ltcl.start_time &lt;= #{param.endTime}
</if>
<if test="param.arriveTimeStart != null ">
and ltcl.arrive_time &gt;= #{param.arriveTimeStart}
</if>
<if test="param.arriveTimeEnd != null ">
and ltcl.arrive_time &lt;= #{param.arriveTimeEnd}
</if>
group by ltcl.id,ltcl.cars_no,
ltcl.plan_loading_number,
ltcl.real_loading_number,
@ -397,12 +433,6 @@
<if test="param.type != null and param.type == 2">
and ltcl.load_status != '0'
</if>
<if test="param.startTime != null">
and ltcl.create_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null">
and ltcl.create_time &lt;= #{param.endTime}
</if>
<if test="param.loadCarsNo != null and param.loadCarsNo != ''">
and Locate(#{param.loadCarsNo},ltcl.cars_no) > 0
</if>
@ -433,6 +463,37 @@
<if test="param.settlementPerson != null and param.settlementPerson != ''">
and Locate(#{param.settlementPerson},ltcl.settlement_person) > 0
</if>
<if test="param.createTimeStart != null ">
and ltcl.create_time &gt;= #{param.createTimeStart}
</if>
<if test="param.createTimeEnd != null ">
and ltcl.create_time &lt;= #{param.createTimeEnd}
</if>
<if test="param.startTime != null ">
and ltcl.start_time &gt;= #{param.startTime}
</if>
<if test="param.endTime != null ">
and ltcl.start_time &lt;= #{param.endTime}
</if>
<if test="param.arriveTimeStart != null ">
and ltcl.arrive_time &gt;= #{param.arriveTimeStart}
</if>
<if test="param.arriveTimeEnd != null ">
and ltcl.arrive_time &lt;= #{param.arriveTimeEnd}
</if>
<if test="param.carrierTimeStart != null ">
and ltcl.arrive_time &gt;= #{param.carrierTimeStart}
</if>
<if test="param.carrierTimeEnd != null ">
and ltcl.arrive_time &lt;= #{param.carrierTimeEnd}
</if>
<if test="param.signTimeStart != null ">
and ltcl.arrive_time &gt;= #{param.signTimeStart}
</if>
<if test="param.signTimeEnd != null ">
and ltcl.arrive_time &lt;= #{param.signTimeEnd}
</if>
group by ltcl.id
order by ltcl.create_time desc
</select>

28
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
Unescape View File

@ -4414,16 +4414,24 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
}
private Long saveNewClient(String unit, String linkman, String linkPhone, String linkAddress, String type) {
BasicdataClientEntity basicdataClientEntity = new BasicdataClientEntity();
basicdataClientEntity.setClientName(unit);
basicdataClientEntity.setTypeService(2);
basicdataClientEntity.setCargoControl(false);
basicdataClientEntity.setClientType(type);//1 工厂 2 商场 3装饰 4个人 5门店 6发货单位
basicdataClientEntity.setLinkman(linkman);
basicdataClientEntity.setPhone(linkPhone);
basicdataClientEntity.setDetailedly(linkAddress);
basicdataClientEntity.setIsNew(1);
return basicdataClientClient.addReturnId(basicdataClientEntity);
Long clientId = null;
BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findByName(unit);
if(Objects.isNull(basicdataClientEntity)){
basicdataClientEntity = new BasicdataClientEntity();
basicdataClientEntity.setClientName(unit);
basicdataClientEntity.setTypeService(2);
basicdataClientEntity.setCargoControl(false);
basicdataClientEntity.setClientType(type);//1 工厂 2 商场 3装饰 4个人 5门店 6发货单位
basicdataClientEntity.setLinkman(linkman);
basicdataClientEntity.setPhone(linkPhone);
basicdataClientEntity.setDetailedly(linkAddress);
basicdataClientEntity.setIsNew(1);
clientId = basicdataClientClient.addReturnId(basicdataClientEntity);
}else{
clientId = basicdataClientEntity.getId();
}
return clientId;
}

30
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
Unescape View File

@ -128,6 +128,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
page.setCurrent(loadCarsDTO.getPageNum());
page.setSize(loadCarsDTO.getPageSize());
loadCarsDTO.setCreateTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getCreateTimeStartStr()));
loadCarsDTO.setCreateTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getCreateTimeEndStr()));
loadCarsDTO.setStartTime(CommonUtil.getStartByDateStr(loadCarsDTO.getStartDate()));
loadCarsDTO.setEndTime(CommonUtil.getEndByDateStr(loadCarsDTO.getEndDate()));
loadCarsDTO.setArriveTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getArriveTimeStartStr()));
loadCarsDTO.setArriveTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getArriveTimeEndStr()));
IPage<TrunklineCarsLoadVO> pageList = baseMapper.loadCarsPageList(page, loadCarsDTO);
List<TrunklineCarsLoadVO> records = pageList.getRecords();
//把records中的id封装成一个set
@ -158,6 +168,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
page.setCurrent(loadCarsDTO.getPageNum());
page.setSize(loadCarsDTO.getPageSize());
loadCarsDTO.setCreateTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getCreateTimeStartStr()));
loadCarsDTO.setCreateTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getCreateTimeEndStr()));
loadCarsDTO.setStartTime(CommonUtil.getStartByDateStr(loadCarsDTO.getStartDate()));
loadCarsDTO.setEndTime(CommonUtil.getEndByDateStr(loadCarsDTO.getEndDate()));
loadCarsDTO.setArriveTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getArriveTimeStartStr()));
loadCarsDTO.setArriveTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getArriveTimeEndStr()));
IPage<TrunklineCarsLoadVO> pageList = baseMapper.arriveCarsPageList(page, loadCarsDTO);
List<TrunklineCarsLoadVO> records = pageList.getRecords();
//把records中的id封装成一个set
@ -1967,9 +1986,20 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
page.setCurrent(loadCarsDTO.getPageNum());
page.setSize(loadCarsDTO.getPageSize());
loadCarsDTO.setCreateTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getCreateTimeStartStr()));
loadCarsDTO.setCreateTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getCreateTimeEndStr()));
loadCarsDTO.setStartTime(CommonUtil.getStartByDateStr(loadCarsDTO.getStartDate()));
loadCarsDTO.setEndTime(CommonUtil.getEndByDateStr(loadCarsDTO.getEndDate()));
loadCarsDTO.setArriveTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getArriveTimeStartStr()));
loadCarsDTO.setArriveTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getArriveTimeEndStr()));
loadCarsDTO.setCarrierTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getCarrierTimeStartStr()));
loadCarsDTO.setCarrierTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getCarrierTimeEndStr()));
loadCarsDTO.setSignTimeStart(CommonUtil.getStartByDateStr(loadCarsDTO.getSignTimeStartStr()));
loadCarsDTO.setSignTimeEnd(CommonUtil.getEndByDateStr(loadCarsDTO.getSignTimeEndStr()));
IPage<TripartiteTransferVO> pageList = baseMapper.tripartiteTransferPageList(page, loadCarsDTO);
return pageList;

Write Preview
Loading…
Cancel
Save