Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 346d8cf4 by 王力
Options

Merge branch 'dev_mp2jpa0809' into 'develop' 

Dev mp2jpa0809

See merge request !329
2 parents d21e84fe 03e5ea41
Inline Side-by-side
Showing with 1 additions and 776 deletions
project-order/src/main/java/com/dituhui/pea/order/dao/CapacityEngineerStatMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.CapacityEngineerStat;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CapacityEngineerStatMPDao extends BaseMapper<CapacityEngineerStat> {
}
project-order/src/main/java/com/dituhui/pea/order/dao/EngineerBusinessMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.EngineerBusiness;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
@Mapper
public interface EngineerBusinessMPDao extends BaseMapper<EngineerBusiness> {
@Select("select * from engineer_business where engineer_code=#{engineerCode}")
EngineerBusiness getByEngineerCode(String engineerCode);
}
project-order/src/main/java/com/dituhui/pea/order/dao/EngineerInfoMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.EngineerInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface EngineerInfoMPDao extends BaseMapper<EngineerInfo> {
@Select("select * from engineer_info where engineer_code = #{engineerCode}")
EngineerInfo getByEngineerCode(String engineerCode);
@Select("select * from engineer_info where engineer_code = #{engineerCode}")
List<EngineerInfo> selectByEngineerCode(String engineerCode);
@Select("<script> select * from engineer_info where engineer_code in " +
"<foreach item='engineerCode' collection='engineerCodes' open='(' separator=',' close=')'>#{engineerCode}</foreach></script>")
List<EngineerInfo> selectByEngineerCodes(@Param("engineerCodes") List<String> engineerCodes);
@Select("select * from engineer_info where group_id = #{groupId}")
List<EngineerInfo> selectByGroupId(String groupId);
@Select("<script> select * from engineer_info where group_id in " +
"<foreach item='groupId' collection='groupIds' open='(' separator=',' close=')'>#{groupId}</foreach></script>")
List<EngineerInfo> selectByGroupIds(@Param("groupIds") List<String> groupIds);
}
\ No newline at end of file
project-order/src/main/java/com/dituhui/pea/order/dao/EngineerSkillGroupMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dituhui.pea.order.entity.EngineerInfo;
import com.dituhui.pea.order.entity.EngineerSkillGroup;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface EngineerSkillGroupMPDao extends BaseMapper<EngineerSkillGroup> {
@Select("select * from engineer_skill_group where engineer_code = #{engineerCode}")
List<EngineerSkillGroup> selectByEngineerCode(String engineerCode);
@Select("select * from engineer_skill_group where skill_group_code = #{skillGroupCode}")
List<EngineerSkillGroup> selectBySkillGroupCode(String skillGroupCode);
}
project-order/src/main/java/com/dituhui/pea/order/dao/EngineerSkillMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.EngineerSkill;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface EngineerSkillMPDao extends BaseMapper<EngineerSkill> {
}
project-order/src/main/java/com/dituhui/pea/order/dao/EngineerTimelineMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.EngineerTimeline;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface EngineerTimelineMPDao extends BaseMapper<EngineerTimeline> {
}
project-order/src/main/java/com/dituhui/pea/order/dao/MapBlockInfoMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dituhui.pea.order.entity.MapBlockInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
@Mapper
public interface MapBlockInfoMPDao extends BaseMapper<MapBlockInfo> {
@Select("select * from map_block_info where block_id=#{blockId}")
MapBlockInfo getByBlockId(String blockId);
@Select("select * from map_block_info where team_id=#{teamId} and layer_id=#{layerId}")
MapBlockInfo getByTeamIdAndLayerId(String teamId,String layerId);
}
project-order/src/main/java/com/dituhui/pea/order/dao/MapLayerCustomizeMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dituhui.pea.order.entity.MapLayerCustomize;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
@Mapper
public interface MapLayerCustomizeMPDao extends BaseMapper<MapLayerCustomize> {
@Select("select * from map_layer_customize where layer_id=#{layerId}")
MapLayerCustomize getByLayerId(String layerId);
}
project-order/src/main/java/com/dituhui/pea/order/dao/MapLayerCustomizeSkillMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dituhui.pea.order.entity.MapLayerCustomizeSkill;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface MapLayerCustomizeSkillMPDao extends BaseMapper<MapLayerCustomizeSkill> {
@Select("select * from map_layer_customize_skill where layer_id=#{layerId};")
List<MapLayerCustomizeSkill> selectByLayerId(String layerId);
}
project-order/src/main/java/com/dituhui/pea/order/dao/MapLayerMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dituhui.pea.order.entity.MapLayer;
import com.dituhui.pea.order.entity.MapLayerCustomize;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
@Mapper
public interface MapLayerMPDao extends BaseMapper<MapLayer> {
@Select("select * from map_layer where layer_id=#{layerId}")
MapLayer getByLayerId(String layerId);
}
project-order/src/main/java/com/dituhui/pea/order/dao/OrderAppointmentMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.OrderAppointment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.time.LocalDate;
import java.util.List;
@Mapper
public interface OrderAppointmentMPDao extends BaseMapper<OrderAppointment> {
@Select("select * from order_appointment where order_id=#{orderId}")
OrderAppointment getByOrderId(String orderId);
@Select("select * from order_appointment where order_id=#{orderId}")
List<OrderAppointment> selectByOrderId(String orderId);
@Select("select * from order_appointment where order_id=#{orderId} and dt=#{dt}")
OrderAppointment getByOrderIdAndDt(String orderId, LocalDate dt);
@Select("select * from order_appointment where order_id=#{orderId} and dt=#{dt}")
List<OrderAppointment> selectByOrderIdAndDt(String orderId, LocalDate dt);
@Select("select * from order_appointment where engineer_code=#{engineerCode} and dt=#{dt}")
List<OrderAppointment> selectByEngineerCodeAndDt(String engineerCode, LocalDate dt);
}
project-order/src/main/java/com/dituhui/pea/order/dao/OrderEventMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.OrderEvent;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface OrderEventMPDao extends BaseMapper<OrderEvent> {
}
project-order/src/main/java/com/dituhui/pea/order/dao/OrderRequestMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.OrderRequest;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface OrderRequestMPDao extends BaseMapper<OrderRequest> {
@Select("select * from order_request where order_id = #{orderId}")
OrderRequest getByOrderId(String orderId);
@Select("select * from order_request where order_id = #{orderId}")
List<OrderRequest> selectByOrderId(String orderId);
@Select("<script> select * from order_request where order_id in " +
"<foreach item='orderId' index='index' collection='orderIds' open='(' separator=',' close=')'>#{orderId}</foreach></script>")
List<OrderRequest> selectByOrderIds(@Param("orderIds") List<String> orderIds);
}
\ No newline at end of file
project-order/src/main/java/com/dituhui/pea/order/dao/OrgBranchMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.OrgBranch;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
@Mapper
public interface OrgBranchMPDao extends BaseMapper<OrgBranch> {
@Select("select * from org_branch where branch_id=#{branchId}")
OrgBranch getByBranchId(String branchId);
}
project-order/src/main/java/com/dituhui/pea/order/dao/OrgClusterMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.OrgCluster;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface OrgClusterMPDao extends BaseMapper<OrgCluster> {
}
project-order/src/main/java/com/dituhui/pea/order/dao/OrgGroupMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.OrderInfo;
import com.dituhui.pea.order.entity.OrgGroup;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.time.LocalDate;
import java.util.List;
@Mapper
public interface OrgGroupMPDao extends BaseMapper<OrgGroup> {
@Select("select * from org_group where group_id = #{groupId}")
OrgGroup getByGroupId(String groupId);
@Select("select * from org_group where group_id = #{groupId}")
List<OrgGroup> selectByGroupId(String groupId);
@Select("<script> select * from org_group where group_id in " +
"<foreach item='groupId' index='index' collection='groupIds' open='(' separator=',' close=')'>#{groupId}</foreach></script>")
List<OrgGroup> selectByGroupIds(@Param("groupIds") List<String> groupIds);
}
project-order/src/main/java/com/dituhui/pea/order/dao/OrgTeamEngineerMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.OrgTeamEngineer;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface OrgTeamEngineerMPDao extends BaseMapper<OrgTeamEngineer> {
@Select("select * from org_team_engineer where team_id = #{teamId}")
List<OrgTeamEngineer> selectByTeamId(String teamId);
}
project-order/src/main/java/com/dituhui/pea/order/dao/OrgTeamMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.OrgTeam;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
@Mapper
public interface OrgTeamMPDao extends BaseMapper<OrgTeam> {
@Select("select * from org_team where team_id=#{teamId}")
OrgTeam getByTeamId(String teamId);
}
project-order/src/main/java/com/dituhui/pea/order/dao/ProductCategoryMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.ProductCategory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface ProductCategoryMPDao extends BaseMapper<ProductCategory> {
}
project-order/src/main/java/com/dituhui/pea/order/dao/SkillGroupMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dituhui.pea.order.entity.SkillGroup;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
@Mapper
public interface SkillGroupMPDao extends BaseMapper<SkillGroup> {
@Select("select * from skill_group where skill_group_code = #{groupCode}")
SkillGroup selectByGroupCode(String groupCode);
}
project-order/src/main/java/com/dituhui/pea/order/dao/SkillInfoMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dituhui.pea.order.entity.SkillInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
@Mapper
public interface SkillInfoMPDao extends BaseMapper<SkillInfo> {
@Select("select * from skill_info where brand=#{brand} and type=#{type} and skill=#{skill}")
SkillInfo getByBrandAndTypeAndSkill(String brand, String type, String skill);
}
project-order/src/main/java/com/dituhui/pea/order/dao/WarehouseInfoMPDao.java deleted 100644 → 0
package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.OrgWarehouseInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface WarehouseInfoMPDao extends BaseMapper<OrgWarehouseInfo> {
}
project-order/src/main/java/com/dituhui/pea/order/entity/CapacityEngineerStat.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.sql.Timestamp;
import java.time.LocalDateTime;
@Data
public class CapacityEngineerStat {
private long id;
private String workday;
private String engineerCode;
private Integer capTotal;
private Integer capUsed;
private Integer capUsedTravel;
private Integer capLeft;
private Integer orderCount;
private Integer maxDuration;
private String memo;
private Timestamp createTime;
private Timestamp updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/EngineerBusiness.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.sql.Timestamp;
@Data
public class EngineerBusiness {
private Integer id;
private String engineerCode;
private String workOn;
private String workOff;
private Integer maxNum;
private Integer maxMinute;
private Integer maxDistance;
private String address;
private String x;
private String y;
private String vehicle;
private String vehicleNo;
private Integer priority;
private Integer departure;
private String memo;
private Timestamp createTime;
private Timestamp updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/EngineerInfo.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.Data;
import java.sql.Timestamp;
import java.util.HashMap;
@Data
@TableName(autoResultMap = true)
public class EngineerInfo {
private Integer id;
private String engineerCode;
private String name;
private String groupId;
private String cosmosId;
private String gender;
private String birth;
private String phone;
private String address;
private Integer kind;
private String grade;
private String credentials;
private String vehicle;
private String vehicleNo;
private String beanStatus;
@TableField(typeHandler = JacksonTypeHandler.class)
private HashMap<String, Object> tags;
private String memo;
private Timestamp createTime;
private Timestamp updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/EngineerSkill.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.sql.Timestamp;
@Data
public class EngineerSkill {
private Integer id;
private String engineerCode;
private String categoryId;
private String description;
private Integer bean_status;
private Integer status;
private String memo;
private Timestamp createTime;
private Timestamp updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/EngineerSkillGroup.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.sql.Timestamp;
@Data
public class EngineerSkillGroup {
private Integer id;
private String engineerCode;
private String skillGroupCode;
private String description;
private Integer beanStatus;
private Integer status;
private String memo;
private Timestamp createTime;
private Timestamp updateTime;
}
\ No newline at end of file
project-order/src/main/java/com/dituhui/pea/order/entity/EngineerTimeline.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.sql.Timestamp;
@Data
public class EngineerTimeline {
private String engineerCode;
private String event;
private Timestamp happen;
private String orderId;
private String suborderId;
private Integer status;
private String memo;
private Timestamp createTime;
private Timestamp updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/MapBlockInfo.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.HashMap;
@Data
public class MapBlockInfo {
private Integer id;
private String blockId;
private String blockName;
private String branchId;
private String groupId;
private String cityCode;
private Integer area;
@TableField(typeHandler = JacksonTypeHandler.class)
private HashMap<String, Object> areaData;
private Integer kind;
private String teamId;
private String layerId;
private String layer;
private Integer status;
private String memo;
private LocalDateTime createTime;
private LocalDateTime updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/MapLayer.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class MapLayer {
private Integer id;
private String layerId;
private String layer;
private String layerDescribe;
private String memo;
private LocalDateTime createTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
project-order/src/main/java/com/dituhui/pea/order/entity/OrderAppointment.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.sql.Timestamp;
import java.time.LocalDate;
@Data
public class OrderAppointment {
private Integer id;
private String orderId;
private String suborderId;
private Integer mainSub;
private String engineerCode;
private String engineerName;
private String engineerPhone;
private Integer engineerAge;
private Integer isWorkshop;
private LocalDate dt;
private Timestamp expectStartTime;
private Timestamp expectEndTime;
private Timestamp actualTime;
private Timestamp actualStartTime;
private Timestamp actualEndTime;
private String preStatus;
private String status;
private String memo;
private Timestamp createTime;
private Timestamp updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/OrderEvent.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.sql.Timestamp;
@Data
public class OrderEvent {
private Integer id;
private String orderId;
private String suborderId;
private Timestamp happen;
private String event;
private String operator;
private String operatorName;
private String source;
private String description;
private String memo;
private Timestamp createTime;
private Timestamp updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/OrderRequest.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.sql.Timestamp;
import java.time.LocalDate;
@Data
public class OrderRequest {
private String id;
private String orderId;
private String name;
private String phone;
private String address;
private String x;
private String y;
private String province;
private String city;
private String county;
private String brand;
private String type;
private String skill;
private String applyNote;
private String faultDescribe;
private LocalDate dt;
private Timestamp expectTimeBegin;
private Timestamp expectTimeEnd;
private String expectTimeDesc;
private String source;
private Integer priority;
private String areaId;
private String orderTags;
private String tags;
private String status;
private String appointmentStatus;
private String appointmentMethod;
private String orgClusterId;
private String orgClusterName;
private String orgBranchId;
private String orgBranchName;
private String orgGroupId;
private String orgGroupName;
private String orgTeamId;
private String orgTeamName;
private String description;
private Timestamp createTime;
private Timestamp updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/OrgBranch.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.sql.Timestamp;
@Data
public class OrgBranch {
private Integer id;
private String branchId;
private String branchName;
private String clusterId;
private String address;
private String x;
private String y;
private Integer kind;
private String layerId;
private String memo;
private Timestamp createTime;
private Timestamp updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/OrgCluster.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.sql.Timestamp;
@Data
public class OrgCluster {
private Integer id;
private String clusterId;
private String name;
private String address;
private String cityName;
private Integer status;
private String updateUser;
private Timestamp createTime;
private Timestamp updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/OrgGroup.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.sql.Timestamp;
@Data
public class OrgGroup {
private Integer id;
private String groupId;
private String groupName;
private String clusterId;
private String branchId;
private String address;
private String x;
private String y;
private String cityCode;
private Integer kind;
private Integer category;
private String warehouseId;
private String memo;
private Timestamp createTime;
private Timestamp updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/OrgTeam.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.sql.Timestamp;
@Data
public class OrgTeam {
private long id;
private String teamId;
private String teamName;
private String teamType;
private String clusterId;
private String branchId;
private String groupId;
private String warehouseId;
private String workdays;
private String memo;
private String workOn;
private Integer status;
private Timestamp createTime;
private Timestamp updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/OrgWarehouseInfo.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
@Data
public class OrgWarehouseInfo {
private long id;
private String warehouseId;
private String warehouseName;
private String branchId;
private String cityCode;
private String address;
private String x;
private String y;
}
project-order/src/main/java/com/dituhui/pea/order/entity/ProductCategory.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
@Data
public class ProductCategory {
private Integer id;
private String productCategoryId;
private String brand;
private String type;
private String skill;
private Integer takeTime;
private Integer takeEngineer;
private Integer lowElectricianCert;
private Integer gasCert;
private String layer;
private String memo;
}
project-order/src/main/java/com/dituhui/pea/order/entity/SkillGroup.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
public class SkillGroup {
private Integer id;
private String skillGroupCode;
private String skillGroup;
private String description;
private String category;
private String memo;
private LocalDateTime createTime;
private LocalDate updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/entity/SkillInfo.java deleted 100644 → 0
package com.dituhui.pea.order.entity;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class SkillInfo {
private Integer id;
private String skillCode;
private String brand;
private String type;
private String skill;
private Integer takeTime;
private Integer takeEngineer;
private Integer lowElectricianCert;
private Integer gasCert;
private Integer priority;
private String skillGroupCode;
private String layerId;
private String typeCategory;
private String skillCategory;
private String memo;
private LocalDateTime createTime;
private LocalDateTime updateTime;
}
project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerTimelineServiceImpl.java
...@@ -82,7 +82,7 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService { ...@@ -82,7 +82,7 @@ public class EngineerTimelineServiceImpl implements EngineerTimelineService {
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder(); CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
CriteriaQuery<OrderEventEntity> criteriaQuery = criteriaBuilder.createQuery(OrderEventEntity.class); CriteriaQuery<OrderEventEntity> criteriaQuery = criteriaBuilder.createQuery(OrderEventEntity.class);
Root<OrderEvent> root = criteriaQuery.from(OrderEvent.class); Root<OrderEventEntity> root = criteriaQuery.from(OrderEventEntity.class);
List<Predicate> predicates = new ArrayList<>(); List<Predicate> predicates = new ArrayList<>();
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceDetailImpl.java
...@@ -200,10 +200,7 @@ public class OrderServiceDetailImpl implements OrderServiceDetail { ...@@ -200,10 +200,7 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
if (egCodes.isEmpty()) { if (egCodes.isEmpty()) {
return map; return map;
} }
LambdaQueryWrapper<EngineerInfo> lqw = new LambdaQueryWrapper<>();
lqw.in(EngineerInfo::getEngineerCode, egCodes);
List<EngineerInfoEntity> rows = engineerInfoDao.findByEngineerCodeIn(egCodes);; List<EngineerInfoEntity> rows = engineerInfoDao.findByEngineerCodeIn(egCodes);;
for (EngineerInfoEntity row : rows) { for (EngineerInfoEntity row : rows) {
map.put(row.getEngineerCode(), row); map.put(row.getEngineerCode(), row);
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!